flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34753 - Returning strongly typed object in Promise fails (Aleksey and Andrey Gorbatov)
Date Sat, 04 Apr 2015 11:23:53 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/develop 151c6fa1e -> b2e06b599


FLEX-34753 - Returning strongly typed object in Promise fails (Aleksey and Andrey Gorbatov)

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/2867276e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/2867276e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/2867276e

Branch: refs/heads/develop
Commit: 2867276ef797d12e13c3bc40ae676b609e1db6a1
Parents: 151c6fa
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Sat Apr 4 13:22:57 2015 +0200
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Sat Apr 4 13:22:57 2015 +0200

----------------------------------------------------------------------
 .../projects/apache/src/org/apache/flex/promises/Promise.as       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2867276e/frameworks/projects/apache/src/org/apache/flex/promises/Promise.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/apache/src/org/apache/flex/promises/Promise.as b/frameworks/projects/apache/src/org/apache/flex/promises/Promise.as
index aacd101..ef39926 100644
--- a/frameworks/projects/apache/src/org/apache/flex/promises/Promise.as
+++ b/frameworks/projects/apache/src/org/apache/flex/promises/Promise.as
@@ -182,8 +182,7 @@ public class Promise implements IThenable
 		try 
 		{
 			if (result && 
-				(typeof(result) === 'object' || 
-				 typeof(result) === 'function') &&
+				result.hasOwnProperty("then") &&
 				result.then is Function)
 			{
 				doResolve_(result.then, resolve_, reject_);


Mime
View raw message