lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-05-03 04:13:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

converting arguments object into true array for setters, restored the original underscore.js methods, and moved radius conversion logic from the setAttrs method to a radiusChange event listener in Ellipse

Browse Source
This commit is contained in:
Eric Rowell 2012-06-20 12:55:34 -07:00
parent ce5a8f3209
commit 5765ab749b
13 changed files with 96 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
dist/kinetic-core.js vendored
View File

@ -3,7 +3,7 @@
* http://www.kineticjs.com/
* Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses.
* Date: Jun 19 2012
* Date: Jun 20 2012
*
* Copyright (C) 2011 - 2012 by Eric Rowell
*
@ -168,12 +168,10 @@ Kinetic.GlobalObject = {
return !!(obj && obj.constructor && obj.call && obj.apply);
},
_isArray: function(obj) {
return obj.length !== undefined;
//return Object.prototype.toString.call(obj) == '[object Array]';
return Object.prototype.toString.call(obj) == '[object Array]';
},
_isObject: function(obj) {
return ( typeof obj == 'object');
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object);
},
_isNumber: function(obj) {
return Object.prototype.toString.call(obj) == '[object Number]';
@ -613,21 +611,6 @@ Kinetic.Node.prototype = {
that._setAttr(obj[key], 'x', pos.x);
that._setAttr(obj[key], 'y', pos.y);
break;
case 'radius':
/*
* root attr radius should be an object
* while all other radius attrs should be
* a number
*/
if(level > 0) {
that._setAttr(obj, key, val);
}
else {
var pos = go._getXY(val);
that._setAttr(obj[key], 'x', pos.x);
that._setAttr(obj[key], 'y', pos.y);
}
break;
case 'scale':
var pos = go._getXY(val);
that._setAttr(obj[key], 'x', pos.x);
@ -747,7 +730,7 @@ Kinetic.Node.prototype = {
*/
setScale: function() {
this.setAttrs({
scale: arguments
scale: Array.prototype.slice.call(arguments)
});
},
/**
@ -755,7 +738,7 @@ Kinetic.Node.prototype = {
* @param {Object} point
*/
setPosition: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
this.setAttrs(pos);
},
/**
@ -779,7 +762,7 @@ Kinetic.Node.prototype = {
* y property
*/
setAbsolutePosition: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
/*
* save rotation and scale and
* then remove them from the transform
@ -822,7 +805,7 @@ Kinetic.Node.prototype = {
* move node by an amount
*/
move: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var x = this.getX();
var y = this.getY();
@ -1002,7 +985,7 @@ Kinetic.Node.prototype = {
*/
setOffset: function() {
this.setAttrs({
offset: arguments
offset: Array.prototype.slice.call(arguments)
});
},
/**
@ -1671,7 +1654,7 @@ Kinetic.Stage.prototype = {
*/
setSize: function() {
// set stage dimensions
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**
@ -1873,7 +1856,7 @@ Kinetic.Stage.prototype = {
* @param {Object} point
*/
getIntersections: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var arr = [];
var shapes = this.get('Shape');
@ -3033,7 +3016,7 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
var a = arguments;
var a = Array.prototype.slice.call(arguments);
if(a.length === 5 || a.length === 9) {
if(!this.appliedShadow) {
@ -3052,7 +3035,7 @@ Kinetic.Shape.prototype = {
context.restore();
if(appliedShadow) {
this.drawImage.apply(this, arguments);
this.drawImage.apply(this, a);
}
},
/**
@ -3121,7 +3104,7 @@ Kinetic.Shape.prototype = {
* element is the y component
*/
intersects: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var stage = this.getStage();
if(this.attrs.detectionType === 'path') {
@ -3321,7 +3304,7 @@ Kinetic.Rect.prototype = {
* set width and height
*/
setSize: function() {
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**
@ -3416,8 +3399,14 @@ Kinetic.Ellipse = function(config) {
};
// call super constructor
Kinetic.Shape.apply(this, [config]);
};
this._convertRadius();
var that = this;
this.on('radiusChange', function() {
that._convertRadius();
});
};
// Circle backwards compatibility
Kinetic.Circle = Kinetic.Ellipse;
@ -3434,9 +3423,24 @@ Kinetic.Ellipse.prototype = {
*/
setRadius: function() {
this.setAttrs({
radius: arguments
radius: Array.prototype.slice.call(arguments)
});
}
},
/**
* converts numeric radius into an object
*/
_convertRadius: function() {
var go = Kinetic.GlobalObject;
var radius = this.getRadius();
// if radius is already an object then return
if(go._isObject(radius)) {
return false;
}
var pos = go._getXY(radius);
this.setAttrs({
radius: pos
});
}
};
// extend Shape
Kinetic.GlobalObject.extend(Kinetic.Ellipse, Kinetic.Shape);
@ -3507,7 +3511,7 @@ Kinetic.Image.prototype = {
* set width and height
*/
setSize: function() {
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**
@ -3524,7 +3528,7 @@ Kinetic.Image.prototype = {
*/
setCrop: function() {
this.setAttrs({
crop: arguments
crop: Array.prototype.slice.call(arguments)
});
}
};
@ -3609,6 +3613,12 @@ Kinetic.Sprite = function(config) {
};
// call super constructor
Kinetic.Shape.apply(this, [config]);
var that = this;
this.on('animationChange', function() {
// reset index when animation changes
that.setIndex(0);
});
};
/*
* Sprite methods
@ -4390,7 +4400,6 @@ Kinetic.Path = function(config) {
this.dataArray = this.getDataArray();
this.on('dataChange', function() {
console.log('changed')
that.dataArray = that.getDataArray();
});
};

6
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/GlobalObject.js
View File

@ -140,12 +140,10 @@ Kinetic.GlobalObject = {
return !!(obj && obj.constructor && obj.call && obj.apply);
},
_isArray: function(obj) {
return obj.length !== undefined;
//return Object.prototype.toString.call(obj) == '[object Array]';
return Object.prototype.toString.call(obj) == '[object Array]';
},
_isObject: function(obj) {
return ( typeof obj == 'object');
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object);
},
_isNumber: function(obj) {
return Object.prototype.toString.call(obj) == '[object Number]';

25
src/Node.js
View File

@ -229,21 +229,6 @@ Kinetic.Node.prototype = {
that._setAttr(obj[key], 'x', pos.x);
that._setAttr(obj[key], 'y', pos.y);
break;
case 'radius':
/*
* root attr radius should be an object
* while all other radius attrs should be
* a number
*/
if(level > 0) {
that._setAttr(obj, key, val);
}
else {
var pos = go._getXY(val);
that._setAttr(obj[key], 'x', pos.x);
that._setAttr(obj[key], 'y', pos.y);
}
break;
case 'scale':
var pos = go._getXY(val);
that._setAttr(obj[key], 'x', pos.x);
@ -363,7 +348,7 @@ Kinetic.Node.prototype = {
*/
setScale: function() {
this.setAttrs({
scale: arguments
scale: Array.prototype.slice.call(arguments)
});
},
/**
@ -371,7 +356,7 @@ Kinetic.Node.prototype = {
* @param {Object} point
*/
setPosition: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
this.setAttrs(pos);
},
/**
@ -395,7 +380,7 @@ Kinetic.Node.prototype = {
* y property
*/
setAbsolutePosition: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
/*
* save rotation and scale and
* then remove them from the transform
@ -438,7 +423,7 @@ Kinetic.Node.prototype = {
* move node by an amount
*/
move: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var x = this.getX();
var y = this.getY();
@ -618,7 +603,7 @@ Kinetic.Node.prototype = {
*/
setOffset: function() {
this.setAttrs({
offset: arguments
offset: Array.prototype.slice.call(arguments)
});
},
/**

6
src/Shape.js
View File

@ -242,7 +242,7 @@ Kinetic.Shape.prototype = {
var appliedShadow = false;
var context = this.getContext();
context.save();
var a = arguments;
var a = Array.prototype.slice.call(arguments);
if(a.length === 5 || a.length === 9) {
if(!this.appliedShadow) {
@ -261,7 +261,7 @@ Kinetic.Shape.prototype = {
context.restore();
if(appliedShadow) {
this.drawImage.apply(this, arguments);
this.drawImage.apply(this, a);
}
},
/**
@ -330,7 +330,7 @@ Kinetic.Shape.prototype = {
* element is the y component
*/
intersects: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var stage = this.getStage();
if(this.attrs.detectionType === 'path') {

4
src/Stage.js
View File

@ -93,7 +93,7 @@ Kinetic.Stage.prototype = {
*/
setSize: function() {
// set stage dimensions
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**
@ -295,7 +295,7 @@ Kinetic.Stage.prototype = {
* @param {Object} point
*/
getIntersections: function() {
var pos = Kinetic.GlobalObject._getXY(arguments);
var pos = Kinetic.GlobalObject._getXY(Array.prototype.slice.call(arguments));
var arr = [];
var shapes = this.get('Shape');

27
src/shapes/Ellipse.js
View File

@ -34,8 +34,14 @@ Kinetic.Ellipse = function(config) {
};
// call super constructor
Kinetic.Shape.apply(this, [config]);
};
this._convertRadius();
var that = this;
this.on('radiusChange', function() {
that._convertRadius();
});
};
// Circle backwards compatibility
Kinetic.Circle = Kinetic.Ellipse;
@ -52,9 +58,24 @@ Kinetic.Ellipse.prototype = {
*/
setRadius: function() {
this.setAttrs({
radius: arguments
radius: Array.prototype.slice.call(arguments)
});
}
},
/**
* converts numeric radius into an object
*/
_convertRadius: function() {
var go = Kinetic.GlobalObject;
var radius = this.getRadius();
// if radius is already an object then return
if(go._isObject(radius)) {
return false;
}
var pos = go._getXY(radius);
this.setAttrs({
radius: pos
});
}
};
// extend Shape
Kinetic.GlobalObject.extend(Kinetic.Ellipse, Kinetic.Shape);

4
src/shapes/Image.js
View File

@ -56,7 +56,7 @@ Kinetic.Image.prototype = {
* set width and height
*/
setSize: function() {
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**
@ -73,7 +73,7 @@ Kinetic.Image.prototype = {
*/
setCrop: function() {
this.setAttrs({
crop: arguments
crop: Array.prototype.slice.call(arguments)
});
}
};

1
src/shapes/Path.js
View File

@ -64,7 +64,6 @@ Kinetic.Path = function(config) {
this.dataArray = this.getDataArray();
this.on('dataChange', function() {
console.log('changed')
that.dataArray = that.getDataArray();
});
};

2
src/shapes/Rect.js
View File

@ -51,7 +51,7 @@ Kinetic.Rect.prototype = {
* set width and height
*/
setSize: function() {
var size = Kinetic.GlobalObject._getSize(arguments);
var size = Kinetic.GlobalObject._getSize(Array.prototype.slice.call(arguments));
this.setAttrs(size);
},
/**

6
src/shapes/Sprite.js
View File

@ -29,6 +29,12 @@ Kinetic.Sprite = function(config) {
};
// call super constructor
Kinetic.Shape.apply(this, [config]);
var that = this;
this.on('animationChange', function() {
// reset index when animation changes
that.setIndex(0);
});
};
/*
* Sprite methods

2
tests/js/manualTests.js
View File

@ -390,7 +390,7 @@ Test.prototype.tests = {
layer.add(Ellipse);
stage.add(layer);
},
'EVENTS - move mouse from shape to another shape in same layer': function(containerId) {
'*EVENTS - move mouse from shape to another shape in same layer': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
width: 578,

2
tests/js/unitTests.js
View File

@ -36,7 +36,7 @@ Test.prototype.tests = {
name: 'myCircle'
});
test(stage.getSize().width === 578 && stage.getSize().height === 200, 'stage size should be 1 x 2');
test(stage.getSize().width === 578 && stage.getSize().height === 200, 'stage size should be 578 x 200');
stage.setSize(1, 2);
test(stage.getSize().width === 1 && stage.getSize().height === 2, 'stage size should be 1 x 2');
stage.setSize(3);