Added a fix for .noConflict(true) not reverting properly. Also added unit tests for...

diff --git a/src/core.js b/src/core.js
index 5221b7b5ed7b35572bb35b80b4157b7943a8d650..7b97646aef96e0bf3ffc40c9932271bae1593681 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -10,8 +10,8 @@
  */\r
 \r
 // Map over jQuery in case of overwrite\r
-if ( typeof jQuery != "undefined" )\r
-       var _jQuery = jQuery;\r
+if ( window.jQuery )\r
+       var _jQuery = window.jQuery;\r
 \r
 var jQuery = window.jQuery = function( selector, context ) {\r
        // If the context is a namespace object, return a new object\r
@@ -21,8 +21,8 @@ var jQuery = window.jQuery = function( selector, context ) {
 };\r
 \r
 // Map over the $ in case of overwrite\r
-if ( typeof $ != "undefined" )\r
-       var _$ = $;\r
+if ( window.$ )\r
+       var _$ = window.$;\r
        \r
 // Map the jQuery namespace to the '$' one\r
 window.$ = jQuery;\r

diff --git a/test/index.html b/test/index.html
index 7d60e098b2008957dae15bf7ade36850527f3658..00ca904f90fadc30dd574a2d253314c993581388 100644 (file)
--- a/test/index.html
+++ b/test/index.html
@@ -4,6 +4,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title>jQuery Test Suite</title>
        <link rel="Stylesheet" media="screen" href="data/testsuite.css" />
+       <script>var jQuery = "jQuery", $ = "$"; // For testing .noConflcit()</script>
        <script type="text/javascript" src="../dist/jquery.js"></script>
        <script type="text/javascript" src="data/testrunner.js"></script>
        <script type="text/javascript" src="unit/core.js"></script>

diff --git a/test/unit/core.js b/test/unit/core.js
index f5fc895a4e3e7bbf5ea0ef29002b80946a6a763a..5101f8181a1c01dfe47aaf7eaa2984c0b5c6a173 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -38,6 +38,27 @@ test("$()", function() {
        equals( div.length, 4, "Correct number of elements generated for div hr code b" );
 });
 
+test("noConflict", function() {
+       expect(6);
+       
+       var old = jQuery;
+       var newjQuery = jQuery.noConflict();
+
+       ok( newjQuery == old, "noConflict returned the jQuery object" );
+       ok( jQuery == old, "Make sure jQuery wasn't touched." );
+       ok( $ == "$", "Make sure $ was reverted." );
+
+       jQuery = $ = old;
+
+       newjQuery = jQuery.noConflict(true);
+
+       ok( newjQuery == old, "noConflict returned the jQuery object" );
+       ok( jQuery == "jQuery", "Make sure jQuery was reverted." );
+       ok( $ == "$", "Make sure $ was reverted." );
+
+       jQuery = $ = old;
+});
+
 test("isFunction", function() {
        expect(21);