Return control of $ and jQuery only if it is really necessary. This make

jQuery.noConflict() callable anytime.
jquery · Oct 19, 2010 · 689d63f4871d96300d492fa5ab9d25301070efba · 689d63f
1 parent 008e971
commit 689d63f4871d96300d492fa5ab9d25301070efba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core.js b/src/core.js
@@ -373,9 +373,9 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
 	noConflict: function( deep ) {
-		window.$ = _$;
+		if ( window.$ === jQuery ) window.$ = _$;
 
-		if ( deep ) {
+		if ( deep && window.jQuery === jQuery ) {
 			window.jQuery = _jQuery;
 		}