library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
jQuery.noConflict() callable anytime.
This commit is contained in:
Jephte CLAIN 2010-10-19 09:29:20 +04:00
parent 008e971943
commit 689d63f487
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core.js
View File

@ -373,9 +373,9 @@ jQuery.extend = jQuery.fn.extend = function() {
jQuery.extend({ jQuery.extend({
noConflict: function( deep ) { noConflict: function( deep ) {
window.$ = _$; if ( window.$ === jQuery ) window.$ = _$;
if ( deep ) { if ( deep && window.jQuery === jQuery ) {
window.jQuery = _jQuery; window.jQuery = _jQuery;
} }