Merge pull request #605 from contactashish13/issue-602-1

Having SCRIPT_DEBUG on causes issues in real time update of charts

Author: rodica-andronache

classes/Visualizer/Render/Page/Update.php

@@ -51,7 +51,7 @@ protected function _toHTML() {
 			if ( $this->settings ) {
 				echo 'win.visualizer.charts.canvas.settings = ', $this->settings, ';';
 			}
-			echo 'win.visualizer.update();';
+			echo 'win.updateChartPreview();';
 
 			echo $this->updateEditorAndSettings();
 

js/preview.js

@@ -33,7 +33,7 @@
 				delete settings['height'];
 
 				v.charts.canvas.settings = settings;
-				v.update();
+                $('body').trigger('visualizer:render:currentchart:update', {visualizer: v});
 			}, 1000);
 		}
 

js/render-chartjs.js

@@ -385,13 +385,6 @@
         }
     }
 
-    if(typeof visualizer !== 'undefined'){
-        // called while updating the chart.
-        visualizer.update = function(){
-            renderChart('canvas', visualizer);
-        };
-    }
-
     $('body').on('visualizer:render:chart:start', function(event, v){
         all_charts = v.charts;
         render(v);
@@ -407,6 +400,11 @@
         renderSpecificChart(v.id, v.chart, v.v);
     });
 
+    $('body').on('visualizer:render:currentchart:update', function(event, v){
+        var data = v || event.detail;
+        renderChart('canvas', data.visualizer);
+    });
+
     // front end actions
     $('body').on('visualizer:action:specificchart', function(event, v){
         switch(v.action){

js/render-datatables.js

@@ -278,13 +278,6 @@
         }
     }
 
-    if(typeof visualizer !== 'undefined'){
-        // called while updating the chart.
-        visualizer.update = function(){
-            renderSpecificChart('canvas', all_charts['canvas'], visualizer);
-        };
-    }
-
     $('body').on('visualizer:render:chart:start', function(event, v){
         all_charts = v.charts;
         render(v);
@@ -294,6 +287,11 @@
         renderSpecificChart(v.id, v.chart, v.v);
     });
 
+    $('body').on('visualizer:render:currentchart:update', function(event, v){
+        var data = v || event.detail;
+        renderSpecificChart('canvas', all_charts['canvas'], data.visualizer);
+    });
+
     // front end actions
     $('body').on('visualizer:action:specificchart', function(event, v){
         switch(v.action){

js/render-facade.js

@@ -81,6 +81,13 @@
     }
 
     $(document).ready(function(){
+
+        // for updating the currently displayed chart (preview mode)
+        window.updateChartPreview = function(){
+            var event = new CustomEvent('visualizer:render:currentchart:update', {detail: {visualizer: visualizer}});
+            document.body.dispatchEvent(event);
+        };
+
         // facade loads N times in the library (where N = the number of different chart libraries supported)
         // so all charts are also loaded N times
         // this will ensure that no matter how many times facade is loaded, it initializes all charts only once.
@@ -168,4 +175,4 @@
 
         return $(this);
     };
-})(jQuery);
+})(jQuery);

js/render-google.js

@@ -319,14 +319,6 @@ var __visualizer_chart_images   = [];
 		}
 	}
 
-    if(typeof visualizer !== 'undefined'){
-        // called while updating the chart.
-        visualizer.update = function(){
-            renderChart('canvas');
-        };
-    }
-
-
     var resizeTimeout;
 
 	$(document).ready(function() {
@@ -421,6 +413,10 @@ var __visualizer_chart_images   = [];
         renderSpecificChart(v.id, v.chart);
     });
 
+    $('body').on('visualizer:render:currentchart:update', function(event, v){
+        renderChart('canvas');
+    });
+
     // front end actions
     $('body').on('visualizer:action:specificchart', function(event, v){
         switch(v.action){