lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-05-06 14:47:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

updated global object utilities

Browse Source
This commit is contained in:
Eric Rowell 2012-06-21 12:47:15 -07:00
parent 5765ab749b
commit ac3f512ab8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/kinetic-core.js vendored
View File

@ -159,7 +159,7 @@ Kinetic.GlobalObject = {
} }
}, },
/* /*
* cherry-picked and modified utilities from underscore.js * cherry-picked utilities from underscore.js
*/ */
_isElement: function(obj) { _isElement: function(obj) {
return !!(obj && obj.nodeType == 1); return !!(obj && obj.nodeType == 1);
@ -171,6 +171,7 @@ Kinetic.GlobalObject = {
return Object.prototype.toString.call(obj) == '[object Array]'; return Object.prototype.toString.call(obj) == '[object Array]';
}, },
_isObject: function(obj) { _isObject: function(obj) {
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object); return (obj !== undefined && obj.constructor == Object);
}, },
_isNumber: function(obj) { _isNumber: function(obj) {

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

File diff suppressed because one or more lines are too long

3
src/GlobalObject.js
View File

@ -131,7 +131,7 @@ Kinetic.GlobalObject = {
} }
}, },
/* /*
* cherry-picked and modified utilities from underscore.js * cherry-picked utilities from underscore.js
*/ */
_isElement: function(obj) { _isElement: function(obj) {
return !!(obj && obj.nodeType == 1); return !!(obj && obj.nodeType == 1);
@ -143,6 +143,7 @@ Kinetic.GlobalObject = {
return Object.prototype.toString.call(obj) == '[object Array]'; return Object.prototype.toString.call(obj) == '[object Array]';
}, },
_isObject: function(obj) { _isObject: function(obj) {
//return obj === Object(obj);
return (obj !== undefined && obj.constructor == Object); return (obj !== undefined && obj.constructor == Object);
}, },
_isNumber: function(obj) { _isNumber: function(obj) {

2
tests/js/manualTests.js
View File

@ -390,7 +390,7 @@ Test.prototype.tests = {
layer.add(Ellipse); layer.add(Ellipse);
stage.add(layer); 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({ var stage = new Kinetic.Stage({
container: containerId, container: containerId,
width: 578, width: 578,