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

Fixed jQuery.eval (or rather, jQuery.globalEval to avoid problems with FF)

Browse source
This commit is contained in:
Jörn Zaefferer 2006-12-02 13:43:02 +00:00
parent ef1ee513d3
commit 39c05d3649
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ajax/ajax.js
View file

@ -124,7 +124,7 @@ jQuery.fn.extend({
// for some weird reason, it doesn't work if the callback is ommited // for some weird reason, it doesn't work if the callback is ommited
jQuery.getScript( this.src ); jQuery.getScript( this.src );
else { else {
jQuery.eval ( this.text || this.textContent || this.innerHTML || "" ); jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
} }
}).end(); }).end();
} }
@ -304,6 +304,10 @@ jQuery.extend({
* Loads, and executes, a remote JavaScript file using an HTTP GET request. * Loads, and executes, a remote JavaScript file using an HTTP GET request.
* All of the arguments to the method (except URL) are optional. * All of the arguments to the method (except URL) are optional.
* *
* Warning: Safari <= 2.0.x is unable to evalulate scripts in a global
* context sychronously. If you load functions via getScript, make sure
* to call them after a delay.
*
* @example $.getScript("test.js") * @example $.getScript("test.js")
* *
* @example $.getScript("test.js", function(){ * @example $.getScript("test.js", function(){
@ -684,7 +688,7 @@ jQuery.extend({
// If the type is "script", eval it in global context // If the type is "script", eval it in global context
if ( type == "script" ) { if ( type == "script" ) {
jQuery.eval( data ); jQuery.globalEval( data );
} }
// Get the JavaScript object, if JSON is used. // Get the JavaScript object, if JSON is used.
@ -727,10 +731,14 @@ jQuery.extend({
return s.join("&"); return s.join("&");
}, },
// TODO document me // evalulates a script in global context
eval: function(data) { // not reliable for safari
globalEval: function(data) {
if (window.execScript) if (window.execScript)
window.execScript( data ); window.execScript( data );
else if(jQuery.browser.safari)
// safari doesn't provide a synchronous global eval
window.setTimeout( data, 0 );
else else
eval.call( window, data ); eval.call( window, data );
} }