Skip to content

Commit 1568cd2

Browse files
committed
Bump version to v0.4.3
1 parent 66faf79 commit 1568cd2

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

chartjs-plugin-annotation.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* chartjs-plugin-annotation.js
33
* http://chartjs.org/
4-
* Version: 0.4.2
4+
* Version: 0.4.3
55
*
66
* Copyright 2016 Evert Timberg
77
* Released under the MIT license
@@ -160,8 +160,12 @@ var annotationPlugin = {
160160

161161
if (chartInstance.annotations) {
162162
var range = getScaleLimits(scaleId, chartInstance.annotations, scale.min, scale.max);
163-
scale.min = range.min;
164-
scale.max = range.max;
163+
if (typeof scale.options.ticks.min === 'undefined' && typeof scale.options.ticks.suggestedMin === 'undefined') {
164+
scale.min = range.min;
165+
}
166+
if (typeof scale.options.ticks.max === 'undefined' && typeof scale.options.ticks.suggestedMax === 'undefined') {
167+
scale.max = range.max;
168+
}
165169
}
166170
});
167171
});

chartjs-plugin-annotation.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.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "chartjs-plugin-annotation",
33
"description": "Annotations for Chart.js",
4-
"version": "0.4.2",
4+
"version": "0.4.3",
55
"license": "MIT",
66
"main": "chartjs-plugin-annotation.js",
77
"repository": {

0 commit comments

Comments
 (0)