diff options
| author | John Resig <jeresig@gmail.com> | 2011-04-12 16:26:41 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2011-04-12 16:26:41 -0400 |
| commit | 122514a8da8f214dc3e7b7b17defdbff862e8748 (patch) | |
| tree | 99fa93f0059eecf23a703a444243e875a41cbc69 | |
| parent | f1d75edec70783d67f0e11459f0a2187d98cc553 (diff) | |
| parent | 596f9a1f21be8b753cb95694da96189edf501ec8 (diff) | |
| download | jquery-122514a8da8f214dc3e7b7b17defdbff862e8748.tar.gz jquery-122514a8da8f214dc3e7b7b17defdbff862e8748.zip | |
Merge branch 'master' of https://github.com/jclain/jquery into jclain-master
| -rw-r--r-- | src/core.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core.js b/src/core.js index 87d5555be..89bbde5c0 100644 --- 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; } |