remove eval statement. fix #906

This commit is contained in:
Лаврёнов Антон
2014-04-26 17:25:21 +08:00
parent 70d7b127c0
commit 577b6c555c
4 changed files with 15 additions and 18 deletions

View File

@@ -4,7 +4,7 @@
* http://www.kineticjs.com/ * http://www.kineticjs.com/
* Copyright 2013, Eric Rowell * Copyright 2013, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: 2014-04-22 * Date: 2014-04-26
* *
* Copyright (C) 2011 - 2013 by Eric Rowell * Copyright (C) 2011 - 2013 by Eric Rowell
* *
@@ -577,7 +577,7 @@ var Kinetic = {};
Kinetic.window = window; Kinetic.window = window;
Kinetic.root = root; Kinetic.root = root;
}((1, eval)('this'), function() { }(this, function() {
// Just return a value to define the module export. // Just return a value to define the module export.
// This example returns an object, but the module // This example returns an object, but the module
@@ -3639,7 +3639,7 @@ var Kinetic = {};
} }
}, },
_get: function(selector) { _get: function(selector) {
return this.nodeType === selector ? [this] : []; return this.className === selector || this.nodeType === selector ? [this] : [];
}, },
_off: function(type, name) { _off: function(type, name) {
var evtListeners = this.eventListeners[type], var evtListeners = this.eventListeners[type],
@@ -6114,7 +6114,7 @@ var Kinetic = {};
})(); })();
function FRAF(callback) { function FRAF(callback) {
Kinetic.root.setTimeout(callback, 1000 / 60); setTimeout(callback, 1000 / 60);
} }
function requestAnimFrame() { function requestAnimFrame() {
@@ -6384,7 +6384,7 @@ var Kinetic = {};
layer.batchDraw(); layer.batchDraw();
}); });
}; };
})((1,eval)('this'));;(function() { })(this);;(function() {
var blacklist = { var blacklist = {
node: 1, node: 1,
duration: 1, duration: 1,
@@ -7817,9 +7817,6 @@ var Kinetic = {};
hasStroke: function() { hasStroke: function() {
return !!(this.stroke() || this.strokeRed() || this.strokeGreen() || this.strokeBlue()); return !!(this.stroke() || this.strokeRed() || this.strokeGreen() || this.strokeBlue());
}, },
_get: function(selector) {
return this.className === selector || this.nodeType === selector ? [this] : [];
},
/** /**
* determines if point is in the shape, regardless if other shapes are on top of it. Note: because * determines if point is in the shape, regardless if other shapes are on top of it. Note: because
* this method clears a temporary canvas and then redraws the shape, it performs very poorly if executed many times * this method clears a temporary canvas and then redraws the shape, it performs very poorly if executed many times
@@ -14424,9 +14421,9 @@ var Kinetic = {};
____init: function(config) { ____init: function(config) {
var that = this; var that = this;
this.className = LABEL;
Kinetic.Group.call(this, config); Kinetic.Group.call(this, config);
this.className = LABEL;
this.on('add.kinetic', function(evt) { this.on('add.kinetic', function(evt) {
that._addListeners(evt.child); that._addListeners(evt.child);
that._sync(); that._sync();

10
kinetic.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -24,7 +24,7 @@
})(); })();
function FRAF(callback) { function FRAF(callback) {
Kinetic.root.setTimeout(callback, 1000 / 60); setTimeout(callback, 1000 / 60);
} }
function requestAnimFrame() { function requestAnimFrame() {
@@ -294,4 +294,4 @@
layer.batchDraw(); layer.batchDraw();
}); });
}; };
})((1,eval)('this')); })(this);

View File

@@ -379,7 +379,7 @@ var Kinetic = {};
Kinetic.window = window; Kinetic.window = window;
Kinetic.root = root; Kinetic.root = root;
}((1, eval)('this'), function() { }(this, function() {
// Just return a value to define the module export. // Just return a value to define the module export.
// This example returns an object, but the module // This example returns an object, but the module