aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2007-08-22 06:19:22 +0000
committerJohn Resig <jeresig@gmail.com>2007-08-22 06:19:22 +0000
commitf2f399dcd552e73f68c9e8adfe26ef7995724cb3 (patch)
tree2eb7e62c4464256c51797048c5469c1c3296d713
parentfc3e180465a88558321b6550ac4692d7cc4b281f (diff)
downloadjquery-f2f399dcd552e73f68c9e8adfe26ef7995724cb3.tar.gz
jquery-f2f399dcd552e73f68c9e8adfe26ef7995724cb3.zip
Fixed use of eval() and new Function() to work within the correct scope (and not throw errors).
-rw-r--r--src/jquery/jquery.js4
-rw-r--r--src/selector/selector.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 7c0562aaf..9bcec930f 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1857,7 +1857,7 @@ jQuery.extend({
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
- fn = eval("function(a,i){return " + fn + "}");
+ fn = eval("false||function(a,i){return " + fn + "}");
var result = [];
@@ -1911,7 +1911,7 @@ jQuery.extend({
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
- fn = eval("function(a){return " + fn + "}");
+ fn = eval("false||function(a){return " + fn + "}");
var result = [];
diff --git a/src/selector/selector.js b/src/selector/selector.js
index cf231111e..bd8c7912d 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -405,7 +405,7 @@ jQuery.extend({
f = jQuery.expr[m[1]][m[2]];
// Build a custom macro to enclose it
- eval("f = function(a,i){return " + f + "}");
+ f = eval("false||function(a,i){return " + f + "}");
// Execute it against the current filter
r = jQuery.grep( r, f, not );