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

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 73eba22b15f4774c9ed1348c473ed9c6fa7eb41b..d56ae0f1ed0d611d032e3d15604b8c70b88c2490 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -124,7 +124,7 @@ jQuery.fn.extend({
                                // for some weird reason, it doesn't work if the callback is ommited
                                jQuery.getScript( this.src );
                        else {
-                               jQuery.eval ( this.text || this.textContent || this.innerHTML || "" );
+                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
                        }
                }).end();
        }
@@ -304,6 +304,10 @@ jQuery.extend({
         * Loads, and executes, a remote JavaScript file using an HTTP GET request.
         * 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", function(){
@@ -684,7 +688,7 @@ jQuery.extend({
 
                // If the type is "script", eval it in global context
                if ( type == "script" ) {
-                       jQuery.eval( data );
+                       jQuery.globalEval( data );
                }
 
                // Get the JavaScript object, if JSON is used.
@@ -727,10 +731,14 @@ jQuery.extend({
                return s.join("&");
        },
        
-       // TODO document me
-       eval: function(data) {
+       // evalulates a script in global context
+       // not reliable for safari
+       globalEval: function(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 );
        }