You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/04/10 12:29:42 UTC
git commit: [flex-asjs] [refs/heads/e4x] - XML issues
Repository: flex-asjs
Updated Branches:
refs/heads/e4x a5ea916d7 -> ff4cf6920
XML issues
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ff4cf692
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ff4cf692
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ff4cf692
Branch: refs/heads/e4x
Commit: ff4cf69200035ff5139310ec635b4d35b7df238a
Parents: a5ea916
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 13:29:35 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 13:29:35 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/QName.as | 8 ++++----
frameworks/projects/XML/src/main/flex/XML.as | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff4cf692/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index 5ed6d42..bfd7b40 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -57,11 +57,11 @@ package
if(localNameVal)
_localName = localNameVal.toString();
}
- else if (qNameOrUri.toString())
+ else if (qNameOrUri && qNameOrUri.toString())
{
- _uri = qNameOrUri;
- if(localName)
- _localName = localName;
+ _uri = qNameOrUri.toString();
+ if(localNameVal)
+ _localName = localNameVal;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff4cf692/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 720a6b0..86a3ed1 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -313,6 +313,7 @@ package
COMPILE::JS
public function XML(xml:String = null)
{
+ _children = [];
if(xml)
{
var parser:DOMParser = new DOMParser();
@@ -807,8 +808,6 @@ package
list.targetObject = this;
list.targetProperty = name;
return list;
-
- return null;
}
COMPILE::JS