You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/12/23 08:41:49 UTC
[26/28] git commit: [flex-asjs] [refs/heads/develop] - fix interpreter
fix interpreter
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5aa8dd08
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5aa8dd08
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5aa8dd08
Branch: refs/heads/develop
Commit: 5aa8dd080eb62d579578a1c45631ee66e11a8a8c
Parents: 77ab7f1
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 22 10:06:05 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 22 10:06:05 2014 -0800
----------------------------------------------------------------------
.../apache/flex/utils/MXMLDataInterpreter.js | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5aa8dd08/frameworks/js/FlexJS/src/org/apache/flex/utils/MXMLDataInterpreter.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/MXMLDataInterpreter.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/MXMLDataInterpreter.js
index 63b2d19..edb40c3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/utils/MXMLDataInterpreter.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/MXMLDataInterpreter.js
@@ -166,13 +166,13 @@ org.apache.flex.utils.MXMLDataInterpreter.initializeStrandBasedObject =
} else {
comp[name] = value;
}
+ }
- beadOffset = i + (m - 1) * 3;
- if (m > 0 && data[beadOffset] === 'beads') {
- m--;
- } else {
- beadOffset = -1;
- }
+ beadOffset = i + (m - 1) * 3;
+ if (m > 0 && data[beadOffset] === 'beads') {
+ m--;
+ } else {
+ beadOffset = -1;
}
for (j = 0; j < m; j++) {
@@ -218,12 +218,11 @@ org.apache.flex.utils.MXMLDataInterpreter.initializeStrandBasedObject =
value = generateMXMLArray(document, null, value);
} else if (simple === false) {
value = generateMXMLObject(document, value);
+ }
+ if (typeof(comp['set_' + name]) === 'function') {
+ comp['set_' + name](value);
} else {
- if (typeof(comp['set_' + name]) === 'function') {
- comp['set_' + name](value);
- } else {
- comp[name] = value;
- }
+ comp[name] = value;
}
}