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

diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 0c865d59f082ddf860cb286332afaea42acbb1d7..6b7250789474631e91aa9c29263577085a76572c 100644 (file)
--- a/ui/jquery.effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.blind = function( o ) {
+$.effects.effect.blind = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index d5b43492e9788b337669a0ba90c65963ad5ca221..8da0feb76309fd01a6434762feb450c0e075bd89 100644 (file)
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -14,7 +14,7 @@
 
 var rshowhide = /show|hide/;
 
-$.effects.bounce = function(o) {
+$.effects.effect.bounce = function(o) {
 
        return this.queue(function() {
 

diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js
index 8cf91da57afae7a98478464b87d24293966fce12..14b358dfae7f55ae0b656edfd2f789165c610e77 100644 (file)
--- a/ui/jquery.effects.clip.js
+++ b/ui/jquery.effects.clip.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.clip = function( o ) {
+$.effects.effect.clip = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 0d326954ad1b7876fc92d46882417c2528883e5d..573cb2554ea98a6dca07b219c3985d7b96b07b4a 100644 (file)
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -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,

diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js
index b88a8c4287a8c688af0f7ecb86cec286aaf824bb..24fb89db0b9b1e8fede62d36db1d05ab63b2d61e 100644 (file)
--- a/ui/jquery.effects.drop.js
+++ b/ui/jquery.effects.drop.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.drop = function( o ) {
+$.effects.effect.drop = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.explode.js b/ui/jquery.effects.explode.js
index 79cf1a9fbbf9efb6747683c0ab2459382f62f12f..b7708f021e2416d0d74a5aa28c6a15fcf4bf4511 100644 (file)
--- a/ui/jquery.effects.explode.js
+++ b/ui/jquery.effects.explode.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.explode = function( o ) {
+$.effects.effect.explode = function( o ) {
 
        return this.queue( function( next ) {
 

diff --git a/ui/jquery.effects.fade.js b/ui/jquery.effects.fade.js
index 825c84e780e197e5099ff8fb050e096a8625610b..5fa0319c0d4c46228a94d1c482f56bd6ded6b62e 100644 (file)
--- a/ui/jquery.effects.fade.js
+++ b/ui/jquery.effects.fade.js
@@ -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' );

diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js
index 19e97c40f2038a228abee8e69abf8d727afa58ff..29da090cb8908f8d6da1e82b504de4add09952c6 100644 (file)
--- a/ui/jquery.effects.fold.js
+++ b/ui/jquery.effects.fold.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.fold = function( o ) {
+$.effects.effect.fold = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js
index b2ffb15e8eaf63951fdf02fcb947651981c65ded..cd4f0705a8ddcedb8ac62e235f60a500f16453f7 100644 (file)
--- a/ui/jquery.effects.highlight.js
+++ b/ui/jquery.effects.highlight.js
@@ -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' ],

diff --git a/ui/jquery.effects.pulsate.js b/ui/jquery.effects.pulsate.js
index c5f67b12bffd0abfd740d8e8ccece20300eded8a..b168b6ef518205c116d6f37f64cf2a0a5d8e7741 100644 (file)
--- a/ui/jquery.effects.pulsate.js
+++ b/ui/jquery.effects.pulsate.js
@@ -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' ),

diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index fcc0708b905a38111e824a7eee35b91675c3bd96..8f25ca9a8a7412e76fead1483b07b5db4e334334 100644 (file)
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -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

diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
index 5e8875abebaef95beefea2bc5c45c10c61f4482a..a1ba1577c31effe188e50ba838b6c4e625e2c0aa 100644 (file)
--- a/ui/jquery.effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.shake = function( o ) {
+$.effects.effect.shake = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js
index eeba117cf85ee8e349c0cd67b66f3533ca4ba46a..6b029675414ef48788e3776397c6669ae797e3f3 100644 (file)
--- a/ui/jquery.effects.slide.js
+++ b/ui/jquery.effects.slide.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.slide = function( o ) {
+$.effects.effect.slide = function( o ) {
 
        return this.queue( function() {
 

diff --git a/ui/jquery.effects.transfer.js b/ui/jquery.effects.transfer.js
index 79b1577d95e75394527894a6451bc5588607a0a7..17d23c5fab27b2f31b74012ee2d17df85a6ef520 100644 (file)
--- a/ui/jquery.effects.transfer.js
+++ b/ui/jquery.effects.transfer.js
@@ -12,7 +12,7 @@
  */
 (function( $, undefined ) {
 
-$.effects.transfer = function( o ) {
+$.effects.effect.transfer = function( o ) {
        
        return this.queue( function() {
                var elem = $( this ),