lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-10-15 12:34:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed Tween and Util regression

Browse Source
This commit is contained in:
Eric Rowell
2013-05-20 23:35:05 -07:00
parent 2812a3d553
commit c9e281c48b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Tween.js
View File

@@ -167,7 +167,7 @@
* @param {Integer} t time in seconds between 0 and the duration * @param {Integer} t time in seconds between 0 and the duration
*/ */
seek: function(t) { seek: function(t) {
this.node = node; var node = this.node;
this._iterate(function(tween) { this._iterate(function(tween) {
tween.seek(t * 1000); tween.seek(t * 1000);
}); });
@@ -189,7 +189,7 @@
* @memberof Kinetic.Tween.prototype * @memberof Kinetic.Tween.prototype
*/ */
finish: function() { finish: function() {
this.node = node; var node = this.node;
this._iterate(function(tween) { this._iterate(function(tween) {
tween.finish(); tween.finish();
}); });

2
src/Util.js
View File

@@ -231,6 +231,7 @@
PI_OVER_DEG180 = Math.PI / 180, PI_OVER_DEG180 = Math.PI / 180,
DEG180_OVER_PI = 180 / Math.PI, DEG180_OVER_PI = 180 / Math.PI,
HASH = '#', HASH = '#',
EMPTY_STRING = '',
ZERO = '0', ZERO = '0',
KINETIC_WARNING = 'Kinetic warning: ', KINETIC_WARNING = 'Kinetic warning: ',
RGB_PAREN = 'rgb(', RGB_PAREN = 'rgb(',
@@ -536,6 +537,7 @@
return ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1); return ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
}, },
_hexToRgb: function(hex) { _hexToRgb: function(hex) {
hex = hex.replace(HASH, EMPTY_STRING);
var bigint = parseInt(hex, 16); var bigint = parseInt(hex, 16);
return { return {
r: (bigint >> 16) & 255, r: (bigint >> 16) & 255,