deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
John Resig 2011-04-12 16:26:41 -04:00
parent f1d75edec7 596f9a1f21
commit 122514a8da
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core.js
View file

@ -358,9 +358,11 @@ 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;
} }