Skip to content
Permalink
Browse files

changed $.execute back to eval()

  • Loading branch information
Gilles van den Hoven
Gilles van den Hoven committed Jun 9, 2006
1 parent 66f124a commit 6596108635d88116be67f6d22183588822e41c44
Showing with 4 additions and 6 deletions.
  1. +2 −2 ajax/ajax.js
  2. +2 −4 jquery/jquery.js
@@ -123,7 +123,7 @@ $.fn.load = function(a,o,f) {
$.xml(t,a,o,function(res){
// Assign it and execute all scripts
self.html(res.responseText).find("script").each(function(){
try { $.execute( this.text || this.textContent || this.innerHTML || ""); } catch(e){}
try { eval( this.text || this.textContent || this.innerHTML || ""); } catch(e){}
});

// Callback function
@@ -316,7 +316,7 @@ $.fn.putForm = function(target, pre_cb, post_cb, url, mth) {
$(target).load(url, this.vars, post_cb);
} else {
this.vars.push({name: 'evaljs', value: 1});
$.xml(mth, url, $.param(this.vars), function(r) { $.execute(r.responseText); });
$.xml(mth, url, $.param(this.vars), function(r) { eval(r.responseText); });
}

return this;
@@ -318,8 +318,6 @@ function $(a,c) {
return self;
}

$.execute = eval;

$.apply = function(o,f,a) {
a = a || [];
if ( f.apply ) {
@@ -330,7 +328,7 @@ $.apply = function(o,f,a) {
p[i] = 'a['+i+']';
}
o.$$exec = this;
var r = $.execute('o.$$exec(' + p.join(',') + ')');
var r = eval('o.$$exec(' + p.join(',') + ')');
o.$$exec = null;
return r;
}
@@ -625,7 +623,7 @@ $.filter = function(t,r,not) {
}

if ( f !== null ) {
$.execute('f = function(a,i){return ' + f + '}');
eval('f = function(a,i){return ' + f + '}');
r = g( r, f );
}
}

0 comments on commit 6596108

Please sign in to comment.
You can’t perform that action at this time.