library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Effects: Remove deprecated $.effects[]. Fixes #7115 - Effects: Remove support for effects in $.effects[].

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-10-25 09:25:40 -04:00
parent 7678b90ae8
commit b8e0de2444
4 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/effects/effects.html
View File

@ -5,9 +5,6 @@
<title>jQuery UI Effects Test Suite</title> <title>jQuery UI Effects Test Suite</title>
<script src="../../jquery.js"></script> <script src="../../jquery.js"></script>
<script>
$.uiBackCompat = false;
</script>
<link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../../../external/qunit.css">
<script src="../../../external/qunit.js"></script> <script src="../../../external/qunit.js"></script>
<script src="../../jquery.simulate.js"></script> <script src="../../jquery.simulate.js"></script>

3
ui/jquery.ui.datepicker.js vendored
View File

@ -693,8 +693,7 @@ $.extend(Datepicker.prototype, {
inst.dpDiv.zIndex($(input).zIndex()+1); inst.dpDiv.zIndex($(input).zIndex()+1);
$.datepicker._datepickerShowing = true; $.datepicker._datepickerShowing = true;
// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed if ( $.effects && $.effects.effect[ showAnim ] )
if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) )
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess); inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
else else
inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess); inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);

32
ui/jquery.ui.effect.js vendored
View File

@ -10,9 +10,7 @@
*/ */
;(jQuery.effects || (function($, undefined) { ;(jQuery.effects || (function($, undefined) {
var backCompat = $.uiBackCompat !== false, var dataSpace = "ui-effects-";
// prefix used for storing data on .data()
dataSpace = "ui-effects-";
$.effects = { $.effects = {
effect: {} effect: {}
@ -1099,15 +1097,7 @@ function standardSpeed( speed ) {
} }
// invalid strings - treat as "normal" speed // invalid strings - treat as "normal" speed
if ( typeof speed === "string" && !$.effects.effect[ speed ] ) { return typeof speed === "string" && !$.effects.effect[ speed ];
// TODO: remove in 2.0 (#7115)
if ( backCompat && $.effects[ speed ] ) {
return false;
}
return true;
}
return false;
} }
$.fn.extend({ $.fn.extend({
@ -1115,12 +1105,9 @@ $.fn.extend({
var args = _normalizeArguments.apply( this, arguments ), var args = _normalizeArguments.apply( this, arguments ),
mode = args.mode, mode = args.mode,
queue = args.queue, queue = args.queue,
effectMethod = $.effects.effect[ args.effect ], effectMethod = $.effects.effect[ args.effect ];
// DEPRECATED: remove in 2.0 (#7115) if ( $.fx.off || !effectMethod ) {
oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
// delegate to the original method (e.g., .show()) if possible // delegate to the original method (e.g., .show()) if possible
if ( mode ) { if ( mode ) {
return this[ mode ]( args.duration, args.complete ); 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 ); 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
});
}
}, },
_show: $.fn.show, _show: $.fn.show,

2
ui/jquery.ui.widget.js vendored
View File

@ -491,7 +491,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
if ( options.delay ) { if ( options.delay ) {
element.delay( 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 ); element[ method ]( options );
} else if ( effectName !== method && element[ effectName ] ) { } else if ( effectName !== method && element[ effectName ] ) {
element[ effectName ]( options.duration, options.easing, callback ); element[ effectName ]( options.duration, options.easing, callback );