Effects: Moved effects to $.effects.effect[] and deprecated use of $.effects[]. Fixes #7103 - Effects: Move effects to $.effects.effect[].

14 files changed, 44 insertions, 21 deletions

diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 0c865d59f..6b7250789 100644
--- 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 d5b43492e..8da0feb76 100644
--- 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 8cf91da57..14b358dfa 100644
--- 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 0d326954a..573cb2554 100644
--- 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 b88a8c428..24fb89db0 100644
--- 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 79cf1a9fb..b7708f021 100644
--- 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 825c84e78..5fa0319c0 100644
--- 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 19e97c40f..29da090cb 100644
--- 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 b2ffb15e8..cd4f0705a 100644
--- 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 c5f67b12b..b168b6ef5 100644
--- 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 fcc0708b9..8f25ca9a8 100644
--- 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 5e8875abe..a1ba1577c 100644
--- 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 eeba117cf..6b0296754 100644
--- 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 79b1577d9..17d23c5fa 100644
--- 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 ),