Merge branch 'master' of https://github.com/jclain/jquery into jclain-master

122514a8 · John Resig · f1d75ede · 596f9a1f · 122514a8
Commit 122514a8 authored Apr 12, 2011 by John Resig
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

core.js src/core.js +4 -2

No files found.
--- a/src/core.js
+++ b/src/core.js
@@ -358,9 +358,11 @@ 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;
 		}