Skip to content

Commit 9405240

Browse files
committed
1.0.3
1 parent bd9a79e commit 9405240

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-chart.js",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"main": [
55
"./dist/angular-chart.js"
66
],

dist/angular-chart.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-chart.js - An angular.js wrapper for Chart.js
33
* http://jtblin.github.io/angular-chart.js/
4-
* Version: 1.0.2
4+
* Version: 1.0.3
55
*
66
* Copyright 2016 Jerome Touffe-Blin
77
* Released under the BSD-2-Clause license
@@ -87,11 +87,13 @@
8787
// If no type was specified set option for the global object
8888
if (! customOptions) {
8989
customOptions = type;
90-
options = angular.extend(options, customOptions);
91-
return;
90+
options = angular.merge(options, customOptions);
91+
} else {
92+
// Set options for the specific chart
93+
options[type] = angular.merge(options[type] || {}, customOptions);
9294
}
93-
// Set options for the specific chart
94-
options[type] = angular.extend(options[type] || {}, customOptions);
95+
96+
angular.merge(ChartJs.Chart.defaults, options);
9597
};
9698

9799
this.$get = function () {

dist/angular-chart.js.tar.gz

50 Bytes
Binary file not shown.

dist/angular-chart.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-chart.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/charts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h1>
9595
<p>
9696
<a class="btn btn-default btn-lg" href="https://github.com/jtblin/angular-chart"><i class="icon-github"></i>Code on Github</a>
9797
<a class="btn btn-success btn-lg" href="../dist/angular-chart.js.tar.gz" download="angular-chart.js.tar.gz">
98-
<i class="fa fa-download"></i> Download <small>(1.0.2)</small>
98+
<i class="fa fa-download"></i> Download <small>(1.0.3)</small>
9999
</a>
100100
</p>
101101
</div>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-chart.js",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "An angular.js wrapper for Chart.js",
55
"homepage": "http://jtblin.github.io/angular-chart.js/",
66
"main": "dist/angular-chart.js",

0 commit comments

Comments
 (0)