Added the c3-angular project using bower

jettro · Jan 1, 2015 · 4ce420c · 4ce420c
1 parent 45b5170
commit 4ce420c
Show file tree

Hide file tree

Showing 8 changed files with 207 additions and 695 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -32,7 +32,7 @@ module.exports = function (grunt) {
                     'bower_components/d3/d3.js',
                     'bower_components/c3/c3.js',
                     'bower_components/moment/moment.js',
-                    'javascript/c3js-directive.js',
+                    'bower_components/c3-angular/c3js-directive.js',
                     'javascript/app.js',
                     'javascript/controllers/*',
                     'javascript/directives.js',

diff --git a/assets/js/elasticsearch-gui.js b/assets/js/elasticsearch-gui.js
diff --git a/assets/js/elasticsearch-gui.min.js b/assets/js/elasticsearch-gui.min.js
diff --git a/assets/js/elasticsearch-gui.min.js.map b/assets/js/elasticsearch-gui.min.js.map
diff --git a/bower.json b/bower.json
@@ -7,6 +7,7 @@
     "c3": "~0.4.7",
     "elasticsearch": "~3.0.2",
     "moment": "~2.8.4",
-    "bootstrap-sass-official": "~3.1.1"
+    "bootstrap-sass-official": "~3.1.1",
+    "c3-angular": "~0.2.0"
   }
 }
diff --git a/javascript/app.js b/javascript/app.js
@@ -19,12 +19,12 @@ myApp.value('localStorage', window.localStorage);
 
 myApp.factory('$exceptionHandler',['$injector', function($injector) {
     return function(exception, cause) {
-        console.log(exception);Moved
+        console.log(exception);
         var errorHandling = $injector.get('errorHandling');
         errorHandling.add(exception.message);
         throw exception;
     };
 }]);
 
 var serviceModule = angular.module('myApp.services', []);
-serviceModule.value('version', 1.2);
+serviceModule.value('version', '1.2.1');