diff options
| author | Jephte CLAIN <Jephte.Clain@univ-reunion.fr> | 2010-10-19 09:29:20 +0400 |
|---|---|---|
| committer | Jephte CLAIN <Jephte.Clain@univ-reunion.fr> | 2010-10-19 09:32:13 +0400 |
| commit | 689d63f4871d96300d492fa5ab9d25301070efba (patch) | |
| tree | 8e7015f47edbffa9e0c3fff7edc8d50d30c6d7cd /src/core.js | |
| parent | 008e971943b0ce55333a65caea7f64eb82b985ac (diff) | |
| download | jquery-689d63f4871d96300d492fa5ab9d25301070efba.tar.gz jquery-689d63f4871d96300d492fa5ab9d25301070efba.zip | |
Return control of $ and jQuery only if it is really necessary. This make
jQuery.noConflict() callable anytime.
Diffstat (limited to 'src/core.js')
| -rw-r--r-- | src/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core.js b/src/core.js index 99521d91c..f701a20c1 100644 --- 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; } |