Merge upstream.

angular-google-chart · Oct 12, 2016 · 92a0d0a · 92a0d0a
1 parent 54f5a3e
commit 92a0d0a
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 200 deletions.
diff --git a/index.html b/index.html
@@ -9,6 +9,7 @@
     <!-- Optional theme -->
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css">
     <!-- Latest compiled and minified JavaScript -->
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
     <link href="style.css" rel="stylesheet">
@@ -75,22 +76,5 @@ <h1>AngularJs Google Chart Tools directive</h1>
 <script src="partials/generic.js"></script>
 <script src="partials/gauge.js"></script>
 <script src="partials/fat.js"></script>
-<!-- Google Analytics -->
-<script>
-    (function (i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r;
-        i[r] = i[r] || function () {
-            (i[r].q = i[r].q || []).push(arguments)
-        }, i[r].l = 1 * new Date();
-        a = s.createElement(o),
-                m = s.getElementsByTagName(o)[0];
-        a.async = 1;
-        a.src = g;
-        m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-    ga('create', 'UA-3451018-11', 'github.io');
-    ga('send', 'pageview');
-</script>
 </body>
 </html>
diff --git a/karma.conf.js b/karma.conf.js
@@ -37,7 +37,7 @@ module.exports = function (config) {
         // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
         reporters: ['dots', 'coverage'],
-        
+
         coverageReporter:{type:'html', dir:'coverage/'},
 
         // web server port
@@ -59,10 +59,10 @@ module.exports = function (config) {
 
         // start these browsers
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        browsers: ['PhantomJS'],
+        browsers: ['PhantomJS', "Chrome"],
 
         // Continuous Integration mode
         // if true, Karma captures browsers, runs the tests and exits
-        singleRun: true
+        singleRun: false
     });
 };
diff --git a/ng-google-chart.js b/ng-google-chart.js
diff --git a/package.json b/package.json
@@ -33,15 +33,16 @@
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-karma": "^0.12.0",
-    "jasmine-core": "^2.3.4",
-    "karma": "^0.13.9",
-    "karma-coverage": "^0.5.2",
-    "karma-jasmine": "^0.3.6",
-    "karma-jasmine-matchers": "^2.0.0-beta1",
-    "karma-phantomjs-launcher": "^0.2.1",
-    "karma-sinon": "^1.0.4",
-    "phantomjs": "^1.9.18",
-    "sinon": "^1.16.1"
+    "grunt-karma": "latest",
+    "jasmine-core": "latest",
+    "karma": "latest",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "latest",
+    "karma-jasmine": "latest",
+    "karma-jasmine-matchers": "latest",
+    "karma-phantomjs-launcher": "latest",
+    "karma-sinon": "latest",
+    "phantomjs": "latest",
+    "sinon": "latest"
   }
 }
diff --git a/sample.js b/sample.js
@@ -22,10 +22,10 @@ angular.module("google-chart-sample", ["ngRoute", "googlechart"]).config(['$rout
             otherwise({
                 redirectTo: '/fat'
             });
-    }]).value('googleChartApiConfig', {
+    }]);/*.value('googleChartApiConfig', {
             version: '1',
             optionalSettings: {
                 packages: ['corechart', 'gauge'],
                 language: 'fr'
             }
-    });
+    });*/
diff --git a/src/googleChartApiPromise.js b/src/googleChartApiPromise.js
@@ -3,48 +3,9 @@
     angular.module('googlechart')
         .factory('googleChartApiPromise', googleChartApiPromiseFactory);
 
-    googleChartApiPromiseFactory.$inject = ['$rootScope', '$q', 'googleChartApiConfig', 'googleJsapiUrl'];
+    googleChartApiPromiseFactory.$inject = ['$rootScope', '$q', 'googleChartApiConfig', 'agcJsapiLoaderStrategy'];
 
-    function googleChartApiPromiseFactory($rootScope, $q, apiConfig, googleJsapiUrl) {
-        apiConfig.optionalSettings = apiConfig.optionalSettings || {};
-        var apiReady = $q.defer();
-        var onLoad = function () {
-            // override callback function
-            var settings = {
-                callback: function () {
-                    var oldCb = apiConfig.optionalSettings.callback;
-                    $rootScope.$apply(function () {
-                        apiReady.resolve(google);
-                    });
-
-                    if (angular.isFunction(oldCb)) {
-                        oldCb.call(this);
-                    }
-                }
-            };
-
-            settings = angular.extend({}, apiConfig.optionalSettings, settings);
-
-            window.google.load('visualization', apiConfig.version, settings);
-        };
-        var head = document.getElementsByTagName('head')[0];
-        var script = document.createElement('script');
-
-        script.setAttribute('type', 'text/javascript');
-        script.src = googleJsapiUrl;
-
-        if (script.addEventListener) { // Standard browsers (including IE9+)
-            script.addEventListener('load', onLoad, false);
-        } else { // IE8 and below
-            script.onreadystatechange = function () {
-                if (script.readyState === 'loaded' || script.readyState === 'complete') {
-                    script.onreadystatechange = null;
-                    onLoad();
-                }
-            };
-        }
-        head.appendChild(script);
-
-        return apiReady.promise;
+    function googleChartApiPromiseFactory($rootScope, $q, apiConfig, agcJsapiLoaderStrategy) {
+        return agcJsapiLoaderStrategy();
     }
 })();