Skip to content

Commit e0b2644

Browse files
committed
Removed guard against duplicate loading. Use safe references to original functions when proxying, don't rename originals.
1 parent cdff72e commit e0b2644

File tree

2 files changed

+51
-52
lines changed

2 files changed

+51
-52
lines changed

ui/jquery.ui.core.js

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313
var uuid = 0,
1414
runiqueId = /^ui-id-\d+$/;
1515

16-
// prevent duplicate loading
17-
// this is only a problem because we proxy existing functions
18-
// and we don't want to double proxy them
16+
// $.ui might exist from components with no dependencies, e.g., $.ui.position
1917
$.ui = $.ui || {};
20-
if ( $.ui.version ) {
21-
return;
22-
}
2318

2419
$.extend( $.ui, {
2520
version: "@VERSION",
@@ -52,20 +47,21 @@ $.extend( $.ui, {
5247

5348
// plugins
5449
$.fn.extend({
55-
_focus: $.fn.focus,
56-
focus: function( delay, fn ) {
57-
return typeof delay === "number" ?
58-
this.each(function() {
59-
var elem = this;
60-
setTimeout(function() {
61-
$( elem ).focus();
62-
if ( fn ) {
63-
fn.call( elem );
64-
}
65-
}, delay );
66-
}) :
67-
this._focus.apply( this, arguments );
68-
},
50+
focus: (function( orig ) {
51+
return function( delay, fn ) {
52+
return typeof delay === "number" ?
53+
this.each(function() {
54+
var elem = this;
55+
setTimeout(function() {
56+
$( elem ).focus();
57+
if ( fn ) {
58+
fn.call( elem );
59+
}
60+
}, delay );
61+
}) :
62+
orig.apply( this, arguments );
63+
};
64+
})( $.fn.focus ),
6965

7066
scrollParent: function() {
7167
var scrollParent;

ui/jquery.ui.effect.js

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* http://api.jqueryui.com/category/effects-core/
1010
*/
11-
;(jQuery.effects || (function($, undefined) {
11+
(function($, undefined) {
1212

1313
var dataSpace = "ui-effects-";
1414

@@ -839,39 +839,42 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
839839
};
840840

841841
$.fn.extend({
842-
_addClass: $.fn.addClass,
843-
addClass: function( classNames, speed, easing, callback ) {
844-
return speed ?
845-
$.effects.animateClass.call( this,
846-
{ add: classNames }, speed, easing, callback ) :
847-
this._addClass( classNames );
848-
},
849-
850-
_removeClass: $.fn.removeClass,
851-
removeClass: function( classNames, speed, easing, callback ) {
852-
return arguments.length > 1 ?
853-
$.effects.animateClass.call( this,
854-
{ remove: classNames }, speed, easing, callback ) :
855-
this._removeClass.apply( this, arguments );
856-
},
857-
858-
_toggleClass: $.fn.toggleClass,
859-
toggleClass: function( classNames, force, speed, easing, callback ) {
860-
if ( typeof force === "boolean" || force === undefined ) {
861-
if ( !speed ) {
862-
// without speed parameter
863-
return this._toggleClass( classNames, force );
842+
addClass: (function( orig ) {
843+
return function( classNames, speed, easing, callback ) {
844+
return speed ?
845+
$.effects.animateClass.call( this,
846+
{ add: classNames }, speed, easing, callback ) :
847+
orig.apply( this, arguments );
848+
};
849+
})( $.fn.addClass ),
850+
851+
removeClass: (function( orig ) {
852+
return function( classNames, speed, easing, callback ) {
853+
return arguments.length > 1 ?
854+
$.effects.animateClass.call( this,
855+
{ remove: classNames }, speed, easing, callback ) :
856+
orig.apply( this, arguments );
857+
};
858+
})( $.fn.removeClass ),
859+
860+
toggleClass: (function( orig ) {
861+
return function( classNames, force, speed, easing, callback ) {
862+
if ( typeof force === "boolean" || force === undefined ) {
863+
if ( !speed ) {
864+
// without speed parameter
865+
return orig.apply( this, arguments );
866+
} else {
867+
return $.effects.animateClass.call( this,
868+
(force ? { add: classNames } : { remove: classNames }),
869+
speed, easing, callback );
870+
}
864871
} else {
872+
// without force parameter
865873
return $.effects.animateClass.call( this,
866-
(force ? { add: classNames } : { remove: classNames }),
867-
speed, easing, callback );
874+
{ toggle: classNames }, force, speed, easing );
868875
}
869-
} else {
870-
// without force parameter
871-
return $.effects.animateClass.call( this,
872-
{ toggle: classNames }, force, speed, easing );
873-
}
874-
},
876+
};
877+
})( $.fn.toggleClass ),
875878

876879
switchClass: function( remove, add, speed, easing, callback) {
877880
return $.effects.animateClass.call( this, {
@@ -1283,4 +1286,4 @@ $.each( baseEasings, function( name, easeIn ) {
12831286

12841287
})();
12851288

1286-
})(jQuery));
1289+
})(jQuery);

0 commit comments

Comments
 (0)