Skip to content
Permalink
Browse files

Effects: Moved effects to $.effects.effect[] and deprecated use of $.…

…effects[]. Fixes #7103 - Effects: Move effects to $.effects.effect[].
  • Loading branch information...
gnarf authored and scottgonzalez committed Mar 15, 2011
1 parent 56b7ec1 commit d64c9efda53f6e56feacf5f39940cd7719a2cb61
@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -14,7 +14,7 @@

var rshowhide = /show|hide/;

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

return this.queue(function() {

@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -9,7 +9,11 @@
*/
;jQuery.effects || (function($, undefined) {

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

$.effects = {
effect: {}
};

/******************************************************************************/
/****************************** COLOR ANIMATIONS ******************************/
@@ -493,7 +497,11 @@ function standardSpeed( speed ) {
}

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

@@ -504,9 +512,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: remove in 2.0 (#7115)
oldEffectMethod = !effectMethod && backCompat && $.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 );
@@ -518,7 +529,19 @@ $.fn.extend({
});
}
}
return effectMethod.call( this, args );

// TODO: remove this check in 2.0, effectMethod will always be true
if ( effectMethod ) {
return effectMethod.call( this, args );
} 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,
@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function( next ) {

@@ -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' );
@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -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' ],
@@ -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' ),
@@ -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' ),
@@ -40,7 +40,7 @@ $.effects.puff = function( o ) {
});
};

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

return this.queue( function() {

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

};

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

return this.queue( function() {
// Create element
@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {

@@ -12,7 +12,7 @@
*/
(function( $, undefined ) {

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

return this.queue( function() {
var elem = $( this ),

0 comments on commit d64c9ef

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