You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/11/06 10:05:29 UTC

[4/5] git commit: [flex-asjs] [refs/heads/develop] - Changed 'is' operator handling to use the new FLEXJS_CLASS_INFO metadata storage.

Changed 'is' operator handling to use the new FLEXJS_CLASS_INFO metadata storage.

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


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e8ef07f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e8ef07f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e8ef07f

Branch: refs/heads/develop
Commit: 8e8ef07f8c99ebd800fbb0be2e1ced10219621aa
Parents: 87aad02
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 6 10:04:17 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 6 10:04:17 2013 +0100

----------------------------------------------------------------------
 frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e8ef07f/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
index a785d96..a4d7792 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/Language.js
@@ -20,7 +20,6 @@ goog.provide('org.apache.flex.utils.Language');
  * @constructor
  */
 org.apache.flex.utils.Language = function() {
-	//
 };
 
 
@@ -69,13 +68,14 @@ org.apache.flex.utils.Language.is = function(leftOperand, rightOperand) {
 	checkInterfaces = function (left) {
 		var i, interfaces;
 
-		interfaces = left.AFJS_INTERFACES;
+		interfaces = left.FLEXJS_CLASS_INFO.interfaces;
 		for (i = interfaces.length - 1; i > -1; i--) {
 			if (interfaces[i] === rightOperand) {
 				return true;
 			}
 
-			if (interfaces[i].prototype.AFJS_INTERFACES) {
+			if (interfaces[i].prototype.FLEXJS_CLASS_INFO &&
+			    interfaces[i].prototype.FLEXJS_CLASS_INFO.interfaces) {
 				return checkInterfaces(new interfaces[i]());
 			}
 		}
@@ -85,7 +85,8 @@ org.apache.flex.utils.Language.is = function(leftOperand, rightOperand) {
 
 	if (leftOperand instanceof rightOperand) {
 		return true;
-	} else if (leftOperand.AFJS_INTERFACES) {
+	} else if (leftOperand.FLEXJS_CLASS_INFO &&
+	    leftOperand.FLEXJS_CLASS_INFO.interfaces) {
 		return checkInterfaces(leftOperand);
 	}