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

respect source guidelines

Browse Source
This commit is contained in:
Jephte CLAIN 2010-11-22 08:12:12 +04:00
parent 689d63f487
commit 1ac7b459a4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core.js
View File

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