Skip to content
Permalink
Browse files

Effects: Remove deprecated $.effects[]. Fixes #7115 - Effects: Remove…

… support for effects in $.effects[].
  • Loading branch information...
jzaefferer committed Oct 25, 2012
1 parent 7678b90 commit b8e0de2444f38e69ad229f404651c9e331a9ac17
Showing with 7 additions and 35 deletions.
  1. +0 −3 tests/unit/effects/effects.html
  2. +1 −2 ui/jquery.ui.datepicker.js
  3. +5 −29 ui/jquery.ui.effect.js
  4. +1 −1 ui/jquery.ui.widget.js
@@ -5,9 +5,6 @@
<title>jQuery UI Effects Test Suite</title>

<script src="../../jquery.js"></script>
<script>
$.uiBackCompat = false;
</script>
<link rel="stylesheet" href="../../../external/qunit.css">
<script src="../../../external/qunit.js"></script>
<script src="../../jquery.simulate.js"></script>
@@ -693,8 +693,7 @@ $.extend(Datepicker.prototype, {
inst.dpDiv.zIndex($(input).zIndex()+1);
$.datepicker._datepickerShowing = true;

// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) )
if ( $.effects && $.effects.effect[ showAnim ] )
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
else
inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
@@ -10,9 +10,7 @@
*/
;(jQuery.effects || (function($, undefined) {

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

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

// invalid strings - treat as "normal" speed
if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
// TODO: remove in 2.0 (#7115)
if ( backCompat && $.effects[ speed ] ) {
return false;
}
return true;
}

return false;
return typeof speed === "string" && !$.effects.effect[ speed ];
}

$.fn.extend({
effect: function( /* effect, options, speed, callback */ ) {
var args = _normalizeArguments.apply( this, arguments ),
mode = args.mode,
queue = args.queue,
effectMethod = $.effects.effect[ args.effect ],
effectMethod = $.effects.effect[ args.effect ];

// DEPRECATED: remove in 2.0 (#7115)
oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];

if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
if ( $.fx.off || !effectMethod ) {
// delegate to the original method (e.g., .show()) if possible
if ( mode ) {
return this[ mode ]( args.duration, args.complete );
@@ -1156,18 +1143,7 @@ $.fn.extend({
}
}

// TODO: remove this check in 2.0, effectMethod will always be true
if ( effectMethod ) {
return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
} else {
// DEPRECATED: remove in 2.0 (#7115)
return oldEffectMethod.call(this, {
options: args,
duration: args.duration,
callback: args.complete,
mode: args.mode
});
}
return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
},

_show: $.fn.show,
@@ -491,7 +491,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
if ( options.delay ) {
element.delay( options.delay );
}
if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
element[ method ]( options );
} else if ( effectName !== method && element[ effectName ] ) {
element[ effectName ]( options.duration, options.easing, callback );

0 comments on commit b8e0de2

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