Skip to content

Commit b8e0de2

Browse files
committed
Effects: Remove deprecated $.effects[]. Fixes #7115 - Effects: Remove support for effects in $.effects[].
1 parent 7678b90 commit b8e0de2

File tree

4 files changed

+7
-35
lines changed

4 files changed

+7
-35
lines changed

tests/unit/effects/effects.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<title>jQuery UI Effects Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script>
9-
$.uiBackCompat = false;
10-
</script>
118
<link rel="stylesheet" href="../../../external/qunit.css">
129
<script src="../../../external/qunit.js"></script>
1310
<script src="../../jquery.simulate.js"></script>

ui/jquery.ui.datepicker.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,7 @@ $.extend(Datepicker.prototype, {
693693
inst.dpDiv.zIndex($(input).zIndex()+1);
694694
$.datepicker._datepickerShowing = true;
695695

696-
// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
697-
if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) )
696+
if ( $.effects && $.effects.effect[ showAnim ] )
698697
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
699698
else
700699
inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);

ui/jquery.ui.effect.js

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
*/
1111
;(jQuery.effects || (function($, undefined) {
1212

13-
var backCompat = $.uiBackCompat !== false,
14-
// prefix used for storing data on .data()
15-
dataSpace = "ui-effects-";
13+
var dataSpace = "ui-effects-";
1614

1715
$.effects = {
1816
effect: {}
@@ -1099,28 +1097,17 @@ function standardSpeed( speed ) {
10991097
}
11001098

11011099
// invalid strings - treat as "normal" speed
1102-
if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
1103-
// TODO: remove in 2.0 (#7115)
1104-
if ( backCompat && $.effects[ speed ] ) {
1105-
return false;
1106-
}
1107-
return true;
1108-
}
1109-
1110-
return false;
1100+
return typeof speed === "string" && !$.effects.effect[ speed ];
11111101
}
11121102

11131103
$.fn.extend({
11141104
effect: function( /* effect, options, speed, callback */ ) {
11151105
var args = _normalizeArguments.apply( this, arguments ),
11161106
mode = args.mode,
11171107
queue = args.queue,
1118-
effectMethod = $.effects.effect[ args.effect ],
1108+
effectMethod = $.effects.effect[ args.effect ];
11191109

1120-
// DEPRECATED: remove in 2.0 (#7115)
1121-
oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
1122-
1123-
if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
1110+
if ( $.fx.off || !effectMethod ) {
11241111
// delegate to the original method (e.g., .show()) if possible
11251112
if ( mode ) {
11261113
return this[ mode ]( args.duration, args.complete );
@@ -1156,18 +1143,7 @@ $.fn.extend({
11561143
}
11571144
}
11581145

1159-
// TODO: remove this check in 2.0, effectMethod will always be true
1160-
if ( effectMethod ) {
1161-
return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
1162-
} else {
1163-
// DEPRECATED: remove in 2.0 (#7115)
1164-
return oldEffectMethod.call(this, {
1165-
options: args,
1166-
duration: args.duration,
1167-
callback: args.complete,
1168-
mode: args.mode
1169-
});
1170-
}
1146+
return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
11711147
},
11721148

11731149
_show: $.fn.show,

ui/jquery.ui.widget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
491491
if ( options.delay ) {
492492
element.delay( options.delay );
493493
}
494-
if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
494+
if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
495495
element[ method ]( options );
496496
} else if ( effectName !== method && element[ effectName ] ) {
497497
element[ effectName ]( options.duration, options.easing, callback );

0 commit comments

Comments
 (0)