X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FContribute%2FForm%2FContributionCharts.tpl;h=0e4d3e4e8a17091fc4fc0c98d640bc40d8d8eece;hb=d08a6665565c9a3493f745fe25080b79c13bc036;hp=9daf832bb98229850ef23a82e0b7c9bc6f295ebb;hpb=da82de8fc3b033f0c5076f790d0755592d4ba46d;p=civicrm-core.git

diff --git a/templates/CRM/Contribute/Form/ContributionCharts.tpl b/templates/CRM/Contribute/Form/ContributionCharts.tpl
index 9daf832bb9..0e4d3e4e8a 100644
--- a/templates/CRM/Contribute/Form/ContributionCharts.tpl
+++ b/templates/CRM/Contribute/Form/ContributionCharts.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -61,25 +61,15 @@
 <script type="text/javascript">
 
   CRM.$(function($) {
-      buildChart( );
+    var chartData = {/literal}{$openFlashChartData}{literal};
+    $.each(chartData, function(chartID, chartValues) {
+      createSWFObject(chartID, chartValues.divName, chartValues.size.xSize, chartValues.size.ySize, 'loadData');
+    });
   });
 
-  function buildChart( ) {
-     var chartData = {/literal}{$openFlashChartData}{literal};
-     cj.each( chartData, function( chartID, chartValues ) {
-
-   var xSize   = eval( "chartValues.size.xSize" );
-   var ySize   = eval( "chartValues.size.ySize" );
-   var divName = eval( "chartValues.divName" );
-
-   createSWFObject( chartID, divName, xSize, ySize, 'loadData' );
-     });
-  }
-
   function loadData( chartID ) {
      var allData = {/literal}{$openFlashChartData}{literal};
-     var data    = eval( "allData." + chartID + ".object" );
-     return JSON.stringify( data );
+     return JSON.stringify(allData[chartID].object);
   }
 
   function byMonthOnClick( barIndex ) {