Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Transition optimizations

Browse Source
This commit is contained in:
Mathias Küsel 2016-01-15 13:06:03 +01:00
parent fa7baa1627
commit c42cb148da
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/core.element.js
View File

@ -26,6 +26,14 @@
if (!this._view) {
this._view = helpers.clone(this._model);
}
// No animation -> No Transition
if (ease === 1) {
this._view = this._model;
this._start = null;
return this;
}
if (!this._start) {
this.pivot();
}
@ -37,16 +45,16 @@
}
// Init if doesn't exist
else if (!this._view[key]) {
if (typeof value === 'number' && isNaN(this._view[key]) === false) {
else if (!this._view.hasOwnProperty(key)) {
if (typeof value === 'number' && !isNaN(this._view[key])) {
this._view[key] = value * ease;
} else {
this._view[key] = value || null;
this._view[key] = value;
}
}
// No unnecessary computations
else if (this._model[key] === this._view[key]) {
else if (value === this._view[key]) {
// It's the same! Woohoo!
}
@ -70,9 +78,6 @@
}
}, this);
if (ease === 1) {
delete this._start;
}
return this;
},
tooltipPosition: function() {