deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

A fix for bug #1443, where globalEval occurred asynchronously in Safari 2, provided by Andrea Giammarchi.

Browse source
This commit is contained in:
John Resig 2007-10-01 20:15:20 +00:00
parent beebbf8ba4
commit ad1cef94bf
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core.js
View file

@ -564,15 +564,19 @@ jQuery.extend({
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 );
// Inspired by code by Andrea Giammarchi
// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
var head = document.getElementsByTagName("head")[0] || document.documentElement,
script = document.createElement("script");
script.type = "text/javascript";
if ( jQuery.browser.msie )
script.text = data;
else
eval.call( window, data );
script.appendChild( document.createTextNode( data ) );
head.appendChild( script );
head.removeChild( script );
}
},

11
test/unit/core.js
View file

@ -123,11 +123,18 @@ test("isFunction", function() {
});
});
var foo = false;
test("$('html')", function() {
expect(2);
expect(4);
reset();
ok( $("<script>var foo='test';</script>")[0], "Creating a script" );
foo = false;
var s = $("<script>var foo='test';</script>")[0];
ok( s, "Creating a script" );
ok( !foo, "Make sure the script wasn't executed prematurely" );
$("body").append(s);
ok( foo, "Executing a scripts contents in the right context" );
reset();
ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );