1.0.3

jtblin · Sep 24, 2016 · 9405240 · 9405240
1 parent bd9a79e
commit 9405240
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": [
     "./dist/angular-chart.js"
   ],

diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -1,7 +1,7 @@
 /*!
  * angular-chart.js - An angular.js wrapper for Chart.js
  * http://jtblin.github.io/angular-chart.js/
- * Version: 1.0.2
+ * Version: 1.0.3
  *
  * Copyright 2016 Jerome Touffe-Blin
  * Released under the BSD-2-Clause license
@@ -87,11 +87,13 @@
       // If no type was specified set option for the global object
       if (! customOptions) {
         customOptions = type;
-        options = angular.extend(options, customOptions);
-        return;
+        options = angular.merge(options, customOptions);
+      } else {
+        // Set options for the specific chart
+        options[type] = angular.merge(options[type] || {}, customOptions);
       }
-      // Set options for the specific chart
-      options[type] = angular.extend(options[type] || {}, customOptions);
+
+      angular.merge(ChartJs.Chart.defaults, options);
     };
 
     this.$get = function () {

diff --git a/dist/angular-chart.js.tar.gz b/dist/angular-chart.js.tar.gz
diff --git a/dist/angular-chart.min.js b/dist/angular-chart.min.js
diff --git a/dist/angular-chart.min.js.map b/dist/angular-chart.min.js.map
diff --git a/examples/charts.html b/examples/charts.html
@@ -95,7 +95,7 @@ <h1>
         <p>
           <a class="btn btn-default btn-lg" href="https://github.com/jtblin/angular-chart"><i class="icon-github"></i>Code on Github</a>
           <a class="btn btn-success btn-lg" href="../dist/angular-chart.js.tar.gz" download="angular-chart.js.tar.gz">
-            <i class="fa fa-download"></i> Download <small>(1.0.2)</small>
+            <i class="fa fa-download"></i> Download <small>(1.0.3)</small>
           </a>
         </p>
       </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "An angular.js wrapper for Chart.js",
   "homepage": "http://jtblin.github.io/angular-chart.js/",
   "main": "dist/angular-chart.js",