[Dojo-checkins] BryanForbes - r27047 - dojo/trunk

[dojo-checkins-admin at dojotoolkit.org]

Author: BryanForbes
Date: Thu Nov 17 22:20:32 2011
New Revision: 27047

Modified:
   dojo/trunk/fx.js
Log:
Fix AMD conversion of dojo/fx. (refs #14238)

Modified: dojo/trunk/fx.js
==============================================================================
--- dojo/trunk/fx.js	(original)
+++ dojo/trunk/fx.js	Thu Nov 17 22:20:32 2011
@@ -33,8 +33,7 @@
 	});
 }
 
-	var coreFx = {};
-	dojo.fx = baseFx;
+	var coreFx = dojo.fx = {};
 
 	var _baseObj = {
 			_fire: function(evt, args){
@@ -154,7 +153,7 @@
 	});
 	lang.extend(_chain, _baseObj);
 
-	coreFx.chain = dojo.fx.chain = function(/*dojo.Animation[]*/ animations){
+	coreFx.chain = /*===== dojo.fx.chain = =====*/ function(/*dojo.Animation[]*/ animations){
 		// summary:
 		//		Chain a list of `dojo.Animation`s to run in sequence
 		//
@@ -247,7 +246,7 @@
 	});
 	lang.extend(_combine, _baseObj);
 
-	coreFx.combine = dojo.fx.combine = function(/*dojo.Animation[]*/ animations){
+	coreFx.combine = /*===== dojo.fx.combine = =====*/ function(/*dojo.Animation[]*/ animations){
 		// summary:
 		//		Combine a list of `dojo.Animation`s to run in parallel
 		//
@@ -277,7 +276,7 @@
 		return new _combine(animations); // dojo.Animation
 	};
 
-	coreFx.wipeIn = dojo.fx.wipeIn = function(/*Object*/ args){
+	coreFx.wipeIn = /*===== dojo.fx.wipeIn = =====*/ function(/*Object*/ args){
 		// summary:
 		//		Expand a node to it's natural height.
 		//
@@ -333,7 +332,7 @@
 		return anim; // dojo.Animation
 	};
 
-	coreFx.wipeOut = dojo.fx.wipeOut = function(/*Object*/ args){
+	coreFx.wipeOut = /*===== dojo.fx.wipeOut = =====*/ function(/*Object*/ args){
 		// summary:
 		//		Shrink a node to nothing and hide it.
 		//
@@ -374,7 +373,7 @@
 		return anim; // dojo.Animation
 	};
 
-	coreFx.slideTo = dojo.fx.slideTo = function(/*Object*/ args){
+	coreFx.slideTo = /*===== dojo.fx.slideTo = =====*/ function(/*Object*/ args){
 		// summary:
 		//		Slide a node to a new top/left position
 		//
@@ -422,7 +421,6 @@
 
 		return anim; // dojo.Animation
 	};
-	lang.mixin(dojo.fx, coreFx); // Add the core api's to the base fx api's for compat.
 
 	return coreFx;
 });