Skip to content

Commit

Permalink
1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jtblin committed Sep 24, 2016
1 parent bd9a79e commit 9405240
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-chart.js",
"version": "1.0.2",
"version": "1.0.3",
"main": [
"./dist/angular-chart.js"
],
Expand Down
12 changes: 7 additions & 5 deletions dist/angular-chart.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 () {
Expand Down
Binary file modified dist/angular-chart.js.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/angular-chart.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/angular-chart.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/charts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 9405240

Please sign in to comment.