Skip to content

Ticket 7103 - Improving Internal Effects API Part 2 - $.effects.effect[] #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gnarf wants to merge 2 commits into from
Closed

Ticket 7103 - Improving Internal Effects API Part 2 - $.effects.effect[] #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e0574
effects: Improving API Part 2 - BC Shim and $.effects.effect[] - Fixe…
gnarf Mar 11, 2011
7941422
ui.datepicker: Updated to check for new or old style effects
gnarf Mar 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/jquery.effects.blind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.blind = function( o ) {
$.effects.effect.blind = function( o ) {

return this.queue( function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.bounce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

var rshowhide = /show|hide/;

$.effects.bounce = function(o) {
$.effects.effect.bounce = function(o) {

return this.queue(function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.clip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.clip = function( o ) {
$.effects.effect.clip = function( o ) {

return this.queue( function() {

Expand Down
32 changes: 26 additions & 6 deletions ui/jquery.effects.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
*/
;jQuery.effects || (function($, undefined) {

$.effects = {};
var BC = $.uiBackCompat !== false;

$.effects = {
// contains effects 1.9+ API effect functions
effect: {}
};
/******************************************************************************/
/****************************** COLOR ANIMATIONS ******************************/
/******************************************************************************/
Expand Down Expand Up @@ -493,7 +497,7 @@ function standardSpeed( speed ) {
}

// invalid strings - treat as "normal" speed
if ( typeof speed === "string" && !$.effects[ speed ] ) {
if ( typeof speed === "string" && ! ( $.effects.effect[ speed ] || BC && $.effects[ speed ] ) ) {
return true;
}

Expand All @@ -504,9 +508,12 @@ $.fn.extend({
effect: function( effect, options, speed, callback ) {
var args = _normalizeArguments.apply( this, arguments ),
mode = args.mode,
effectMethod = $.effects[ args.effect ];

if ( $.fx.off || !effectMethod ) {
effectMethod = $.effects.effect[ args.effect ],

// DEPRECATED: Pre 1.9 API - effect functions existed in $.effects
oldEffectMethod = !effectMethod && BC && $.effects[ args.effect ];

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

// DEPRECATED: effectMethod will always be true once BC is removed
if ( effectMethod ) {
return effectMethod.call( this, args );
} else {

// DEPRECATED: convert back to old format
return oldEffectMethod.call(this, {
options: args,
duration: args.duration,
callback: args.complete,
mode: args.mode
});
}
},

_show: $.fn.show,
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.drop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.drop = function( o ) {
$.effects.effect.drop = function( o ) {

return this.queue( function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.explode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.explode = function( o ) {
$.effects.effect.explode = function( o ) {

return this.queue( function( next ) {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.fade.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.fade = function( o ) {
$.effects.effect.fade = function( o ) {
return this.queue( function() {
var el = $( this ),
mode = $.effects.setMode( el, o.mode || 'hide' );
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.fold.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.fold = function( o ) {
$.effects.effect.fold = function( o ) {

return this.queue( function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.highlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.highlight = function( o ) {
$.effects.effect.highlight = function( o ) {
return this.queue( function() {
var elem = $( this ),
props = [ 'backgroundImage', 'backgroundColor', 'opacity' ],
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.pulsate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.pulsate = function( o ) {
$.effects.effect.pulsate = function( o ) {
return this.queue( function() {
var elem = $( this ),
mode = $.effects.setMode( elem, o.mode || 'show' ),
Expand Down
6 changes: 3 additions & 3 deletions ui/jquery.effects.scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.puff = function( o ) {
$.effects.effect.puff = function( o ) {
return this.queue( function() {
var elem = $( this ),
mode = $.effects.setMode( elem, o.mode || 'hide' ),
Expand Down Expand Up @@ -40,7 +40,7 @@ $.effects.puff = function( o ) {
});
};

$.effects.scale = function( o ) {
$.effects.effect.scale = function( o ) {

return this.queue( function() {

Expand Down Expand Up @@ -92,7 +92,7 @@ $.effects.scale = function( o ) {

};

$.effects.size = function( o ) {
$.effects.effect.size = function( o ) {

return this.queue( function() {
// Create element
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.shake.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.shake = function( o ) {
$.effects.effect.shake = function( o ) {

return this.queue( function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.slide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.slide = function( o ) {
$.effects.effect.slide = function( o ) {

return this.queue( function() {

Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.effects.transfer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

$.effects.transfer = function( o ) {
$.effects.effect.transfer = function( o ) {

return this.queue( function() {
var elem = $( this ),
Expand Down
8 changes: 6 additions & 2 deletions ui/jquery.ui.datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,9 @@ $.extend(Datepicker.prototype, {
}
};
inst.dpDiv.zIndex($(input).zIndex()+1);
if ($.effects && $.effects[showAnim])

// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) )
inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
else
inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
Expand Down Expand Up @@ -781,7 +783,9 @@ $.extend(Datepicker.prototype, {
$.datepicker._tidyDialog(inst);
this._curInst = null;
};
if ($.effects && $.effects[showAnim])

// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) )
inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
else
inst.dpDiv[(showAnim == 'slideDown' ? 'slideUp' :
Expand Down