Commit 689d63f4 authored by Jephte CLAIN's avatar Jephte CLAIN

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

jQuery.noConflict() callable anytime.
parent 008e9719
...@@ -373,9 +373,9 @@ jQuery.extend = jQuery.fn.extend = function() { ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment