[Pkg-javascript-commits] [dojo] 08/87: Fix AMD conversion of dojo/fx and modules using it (refs #14238).

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.7.5
in repository dojo.

commit 385bb7b98b2b28324feac66d7ff837d557bb7406
Author: Bryan Forbes <bryan at reigndropsfall.net>
Date:   Fri Nov 18 06:18:44 2011 +0000

    Fix AMD conversion of dojo/fx and modules using it (refs #14238).
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.7/dojo@27046 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 fx.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/fx.js b/fx.js
index b873797..55160ff 100644
--- a/fx.js
+++ b/fx.js
@@ -33,8 +33,7 @@ if(!dojo.isAsync){
 	});
 }
 
-	var coreFx = {};
-	dojo.fx = baseFx;
+	var coreFx = dojo.fx = {};
 
 	var _baseObj = {
 			_fire: function(evt, args){
@@ -154,7 +153,7 @@ if(!dojo.isAsync){
 	});
 	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 @@ if(!dojo.isAsync){
 	});
 	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 @@ if(!dojo.isAsync){
 		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 @@ if(!dojo.isAsync){
 		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 @@ if(!dojo.isAsync){
 		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 @@ if(!dojo.isAsync){
 
 		return anim; // dojo.Animation
 	};
-	lang.mixin(dojo.fx, coreFx); // Add the core api's to the base fx api's for compat.
 
 	return coreFx;
 });

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git