Skip to content
Permalink
Browse files

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

jQuery.noConflict() callable anytime.
  • Loading branch information...
gdrsi committed Oct 19, 2010
1 parent 008e971 commit 689d63f4871d96300d492fa5ab9d25301070efba
Showing with 2 additions and 2 deletions.
  1. +2 −2 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;
}

0 comments on commit 689d63f

Please sign in to comment.
You can’t perform that action at this time.