mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-31 23:21:42 +03:00
Code Issues Projects Releases Wiki Activity

removing psuedo-private accessors from Spring class

Browse Source
This commit is contained in:
thatcher 2011-12-29 18:18:09 -05:00
parent 1e21c898bf
commit 3bff4fe532
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/spring.js
View File

@ -20,51 +20,51 @@ $.Spring = function( options ) {
}; };
} }
$.extend( true, this, options ); $.extend( true, this, options);
this._currentValue = typeof ( this.initial ) == "number" ? this.initial : 0; this.currentValue = typeof ( this.initial ) == "number" ? this.initial : 0;
this._startValue = this._currentValue; this.startValue = this.currentValue;
this._targetValue = this._currentValue; this.targetValue = this.currentValue;
this._currentTime = new Date().getTime(); // always work in milliseconds this.currentTime = new Date().getTime(); // always work in milliseconds
this._startTime = this._currentTime; this.startTime = this.currentTime;
this._targetTime = this._currentTime; this.targetTime = this.currentTime;
}; };
$.Spring.prototype = { $.Spring.prototype = {
getCurrent: function() { getCurrent: function() {
return this._currentValue; return this.currentValue;
}, },
getTarget: function() { getTarget: function() {
return this._targetValue; return this.targetValue;
}, },
resetTo: function(target) { resetTo: function(target) {
this._targetValue = target; this.targetValue = target;
this._targetTime = this._currentTime; this.targetTime = this.currentTime;
this._startValue = this._targetValue; this.startValue = this.targetValue;
this._startTime = this._targetTime; this.startTime = this.targetTime;
}, },
springTo: function(target) { springTo: function(target) {
this._startValue = this._currentValue; this.startValue = this.currentValue;
this._startTime = this._currentTime; this.startTime = this.currentTime;
this._targetValue = target; this.targetValue = target;
this._targetTime = this._startTime + 1000 * this.animationTime; this.targetTime = this.startTime + 1000 * this.animationTime;
}, },
shiftBy: function(delta) { shiftBy: function(delta) {
this._startValue += delta; this.startValue += delta;
this._targetValue += delta; this.targetValue += delta;
}, },
update: function() { update: function() {
this._currentTime = new Date().getTime(); this.currentTime = new Date().getTime();
this._currentValue = (this._currentTime >= this._targetTime) ? this._targetValue : this.currentValue = (this.currentTime >= this.targetTime) ? this.targetValue :
this._startValue + (this._targetValue - this._startValue) * this.startValue + (this.targetValue - this.startValue) *
transform( this.springStiffness, (this._currentTime - this._startTime) / (this._targetTime - this._startTime)); transform( this.springStiffness, (this.currentTime - this.startTime) / (this.targetTime - this.startTime));
} }
} }