Skip to content
Permalink
Browse files

Brought back jQuery.globalEval(), fixing bug #1425.

  • Loading branch information
jeresig committed Jul 31, 2007
1 parent 4ae80a1 commit 6b0d3bb273f09910921ed84539de06c2e7ecd19b
Showing with 17 additions and 2 deletions.
  1. +1 −1 src/ajax/ajax.js
  2. +16 −1 src/jquery/jquery.js
@@ -765,7 +765,7 @@ jQuery.extend({

// If the type is "script", eval it in global context
if ( type == "script" )
(new Function( data ))();
jQuery.globalEval( data );

// Get the JavaScript object, if JSON is used.
if ( type == "json" )
@@ -1191,7 +1191,7 @@ jQuery.fn = jQuery.prototype = {
if ( this.src )
jQuery.ajax({ url: this.src, async: false, dataType: "script" });
else
(new Function( this.text || this.textContent || this.innerHTML || "" ))();
jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
} else
fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
});
@@ -1322,6 +1322,21 @@ jQuery.extend({
elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
},

// Evalulates a script in a global context
// Evaluates Async. in Safari 2 :-(
globalEval: function( data ) {
data = jQuery.trim( data );
if ( data ) {
if ( window.execScript )
window.execScript( data );
else if ( jQuery.browser.safari )
// safari doesn't provide a synchronous global eval
window.setTimeout( data, 0 );
else
eval.call( window, data );
}
},

nodeName: function( elem, name ) {
return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
},

0 comments on commit 6b0d3bb

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