Changeset 2833

Timestamp:

08/22/07 05:44:47 (1 year ago)

Author:

jeresig

Message:

Made 'jQuery' unrollable via .noConflict(true) and instances of new Function() have been converted to eval(function(){}) in order to handle jQuery name changes. (Bug #1393)

Files:

• trunk/jquery/src/jquery/jquery.js (modified) (5 diffs)

trunk/jquery/src/jquery/jquery.js

@@ -20 +20 @@
  * @cat Core
  */
+
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+    var _jQuery = jQuery;
+
 var jQuery = window.jQuery = function(a,c) {
     // If the context is global, return a new object
@@ -30 +35 @@
 // Map over the $ in case of overwrite
 if ( typeof $ != "undefined" )
-    jQuery._$ = $;
+    var _$ = $;
     
 // Map the jQuery namespace to the '$' one
@@ -1346 +1351 @@
      * @cat Core 
      */
-    noConflict: function() {
-        if ( jQuery._$ )
-            $ = jQuery._$;
+    noConflict: function(deep) {
+        window.$ = _$;
+        if ( deep )
+            window.jQuery = _jQuery;
         return jQuery;
     },
@@ -1852 +1858 @@
         // for it (a handy shortcut)
         if ( typeof fn == "string" )
-            fn = new Function("a","i","return " + fn);
+            fn = eval("function(a,i){return " + fn + "}");
 
         var result = [];
@@ -1906 +1912 @@
         // for it (a handy shortcut)
         if ( typeof fn == "string" )
-            fn = new Function("a","return " + fn);
+            fn = eval("function(a){return " + fn + "}");
 
         var result = [];