[Pkg-javascript-commits] [dojo] 112/149: fixes #5954, argument detection for combine and chain

[David Prévot]

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

taffit pushed a commit to branch master
in repository dojo.

commit ab283730805469166b8f2f22738199c0e69915e5
Author: dylans <dylan at dojotoolkit.org>
Date:   Sun Dec 27 05:32:51 2015 -0700

    fixes #5954, argument detection for combine and chain
---
 fx.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fx.js b/fx.js
index 37cc620..381b11c 100644
--- a/fx.js
+++ b/fx.js
@@ -14,7 +14,7 @@ define([
 
 	// module:
 	//		dojo/fx
-	
+
 	// For back-compat, remove in 2.0.
 	if(!dojo.isAsync){
 		ready(0, function(){
@@ -170,7 +170,7 @@ define([
 		//	|		]).play();
 		//	|	});
 		//
-		return new _chain(animations); // dojo/_base/fx.Animation
+		return new _chain(lang.isArray(animations) ? animations : Array.prototype.slice.call(arguments, 0)); // dojo/_base/fx.Animation
 	};
 
 	var _combine = function(animations){
@@ -253,8 +253,9 @@ define([
 		//		Combine a list of `dojo/_base/fx.Animation`s to run in parallel
 		//
 		// description:
-		//		Combine an array of `dojo/_base/fx.Animation`s to run in parallel,
-		//		providing a new `dojo/_base/fx.Animation` instance encompasing each
+		//		Combine an array of `dojo/_base/fx.Animation`s or N
+		//		`dojo/_base/fx.Animation`s  to run in parallel, providing
+		//		a new `dojo/_base/fx.Animation` instance encompassing each
 		//		animation, firing standard animation events.
 		//
 		// example:
@@ -279,7 +280,7 @@ define([
 		//	|		anim.play(); // play the animation
 		//	|	});
 		//
-		return new _combine(animations); // dojo/_base/fx.Animation
+		return new _combine(lang.isArray(animations) ? animations : Array.prototype.slice.call(arguments, 0)); // dojo/_base/fx.Animation
 	};
 
 	coreFx.wipeIn = function(/*Object*/ args){

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