wrapped dashboard js in jvent function. passing google in as param.

kevinkhill · Jan 17, 2016 · e6b533d · e6b533d
1 parent 202c4f4
commit e6b533d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/javascript/lava.js b/javascript/lava.js
@@ -76,6 +76,8 @@ var lava = lava || {};
   this.ready = function (callback) {
     if (typeof callback !== 'function') {
       throw new Error('[Lavacharts] ' + typeof callback + ' is not a valid callback.');
+    } else {
+        var callback = function(){};
     }
 
     lava.readyCallback = callback;
@@ -201,7 +203,7 @@ var lava = lava || {};
   };
 
   /**
-   * Redraws all of the registed charts on screen.
+   * Redraws all of the registered charts on screen.
    *
    *
    * This method is attached to the window resize event with a 300ms debounce
@@ -231,7 +233,7 @@ var lava = lava || {};
           if (event.type === "load" || (/loaded|complete/.test(this.readyState))) {
             this.onload = this.onreadystatechange = null;
 
-            lava.events.emit('jsapi:ready');
+            lava.events.emit('jsapi:ready', window.google);
           }
         };
 

diff --git a/src/Javascript/ChartFactory.php b/src/Javascript/ChartFactory.php
@@ -143,7 +143,7 @@ private function buildFormatters()
     private function getTemplate()
     {
         return <<<'CHART'
-        lava.events.on('jsapi:ready', function() {
+        lava.events.on('jsapi:ready', function (google) {
             /**
              * If the object does not exist for a given chart type, initialize it.
              * This will prevent overriding keys when multiple charts of the same
@@ -195,7 +195,6 @@ private function getTemplate()
                 packages: ['<chartPackage>'],
                 callback: function() {
                     lava.charts.<chartType>["<chartLabel>"].render();
-                    //lava.readyCallback();
                 }
             });
         });

diff --git a/src/Javascript/DashboardFactory.php b/src/Javascript/DashboardFactory.php
@@ -149,34 +149,35 @@ private function mapWrapperArray($wrapperArray)
     private function getTemplate()
     {
         return <<<'DASH'
-        //Checking if dashboard div exists
-        if (! document.getElementById("<elemId>")) {
-            throw new Error('[Lavacharts] No matching element was found with ID "<elemId>"');
-        }
+        lava.events.on('jsapi:ready', function (google) {
+            //Checking if dashboard div exists
+            if (! document.getElementById("<elemId>")) {
+                throw new Error('[Lavacharts] No matching element was found with ID "<elemId>"');
+            }
 
-        lava.dashboards["<label>"] = new lava.Dashboard();
+            lava.dashboards["<label>"] = new lava.Dashboard();
 
-        lava.dashboards["<label>"].render = function() {
-            var $this = lava.dashboards["<label>"];
+            lava.dashboards["<label>"].render = function() {
+                var $this = lava.dashboards["<label>"];
 
-            $this.dashboard = new <class>(document.getElementById('<elemId>'));
+                $this.dashboard = new <class>(document.getElementById('<elemId>'));
 
-            $this.data = new <dataClass>(<chartData>, <dataVer>);
+                $this.data = new <dataClass>(<chartData>, <dataVer>);
 
-            <bindings>
+                <bindings>
 
-            $this.dashboard.draw($this.data);
-        };
+                $this.dashboard.draw($this.data);
+            };
 
-        google.load('visualization', '<version>', {
-            packages: <packages>,
-            callback: function() {
-                lava.dashboards["<label>"].render();
-                lava.readyCallback();
-            }
-        });
+            google.load('visualization', '<version>', {
+                packages: <packages>,
+                callback: function() {
+                    lava.dashboards["<label>"].render();
+                }
+            });
 
-        //lava.register("<chartType>", "<chartLabel>");
+            //lava.register("<chartType>", "<chartLabel>");
+        });
 DASH;
     }