Merge pull request #853 from Codeinwp/feature/849

Render chart script in dashboard areas

Author: cristian-ungureanu

classes/Visualizer/Module/Frontend.php

@@ -54,6 +54,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		parent::__construct( $plugin );
 
 		$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
+		$this->_addAction( 'load-index.php', 'enqueueScripts' );
 		$this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' );
 		$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
 		$this->_addShortcode( 'visualizer', 'renderChart' );

js/render-google.js

@@ -265,11 +265,15 @@ var __visualizer_chart_images   = [];
                     case 'date':
                         // fall-through.
                     case 'datetime':
-                        var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
-                        if ( isNaN( dateParse ) ) {
-                            dateParse = Date.parse(data[i][j]);
+                        if (typeof data[i][j] === 'string') {
+                            var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
+                            if ( isNaN( dateParse ) ) {
+                                dateParse = Date.parse(data[i][j]);
+                            }
+                            date = new Date( dateParse );
+                        } else if(typeof data[i][j] === 'object') {
+                            date = data[i][j];
                         }
-                        date = new Date( dateParse );
                         data[i][j] = null;
                         if (Object.prototype.toString.call(date) === "[object Date]") {
                             if (!isNaN(date.getTime())) {