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/11 00:48:42 UTC

[31/49] git commit: [flex-asjs] [refs/heads/develop] - Fixed remaining XML errors

Fixed remaining XML errors


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

Branch: refs/heads/develop
Commit: 7ed59b5607156b2c2571b06e79efa39a929b9fe3
Parents: 7edb7e5
Author: Harbs <ha...@in-tools.com>
Authored: Thu Feb 18 14:23:48 2016 +0200
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Feb 18 14:23:48 2016 +0200

----------------------------------------------------------------------
 frameworks/projects/XML/src/main/flex/XML.as    | 30 +++++++++++---------
 .../projects/XML/src/main/flex/XMLList.as       |  4 +--
 2 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7ed59b56/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 49f2fd1..a611db0 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -326,17 +326,17 @@ package
 			// get rid of nodes we do not want 
 
 			//loop through the child nodes and build XML obejcts for each.
-			/*
+			
 			Object.defineProperty(this,"0",
 				{
-					get: function() { return this; },
-					set: function(newValue:*) {
+					"get": function():* { return this; },
+					"set": function(newValue:*):void {
 					},
 					enumerable: true,
 					configurable: true
 				}
 			);
-			*/
+			
 		}
 		
 		private var _children:Array;
@@ -556,7 +556,7 @@ package
 				for(i=0;i<_attributes.length;i++)
 				{
 					if(propertyName.matches(_attributes[i].name()))
-						list.append(_attributes[i]);
+						list.appendChild(_attributes[i]);
 				}
 			}
 			else
@@ -564,7 +564,7 @@ package
 				for(i=0;i<_children.length;i++)
 				{
 					if(propertyName.matches(_children[i].name()))
-						list.append(_children[i]);
+						list.appendChild(_children[i]);
 				}
 			}
 			list.targetObject = this;
@@ -597,7 +597,7 @@ package
 			var i:int;
 			var list:XMLList = new XMLList();
 			for(i=0;i<_children.length;i++)
-				list.append(_children[i]);
+				list.appendChild(_children[i]);
 
 			list.targetObject = this;
 			return list;
@@ -616,7 +616,7 @@ package
 			for(i=0;i<_children.length;i++)
 			{
 				if(_children[i].nodeKind() == "comment")
-					list.append(_children[i]);
+					list.appendChild(_children[i]);
 			}
 			list.targetObject = this;
 			return list;
@@ -766,7 +766,7 @@ package
 			for(i=0;i<_children.length;i++)
 			{
 				if(_children[i].nodeKind() == "element" && name.matches(_children[i].name()))
-					list.append(_children[i]);
+					list.appendChild(_children[i]);
 			}
 
 			list.targetObject = this;
@@ -1804,8 +1804,8 @@ package
 			if(value is XMLList)
 			{
 				// remove all existing elements
-				var chldrn:XMLList = this.child(elementName);
-				var childIdx:int = children().length() -1;
+				var chldrn:XMLList = children();
+				var childIdx:int = chldrn.length() -1;
 				if(chldrn.length())
 					childIdx = chldrn[0].childIndex();
 				
@@ -1922,7 +1922,7 @@ package
 			for(i=0;i<_children.length;i++)
 			{
 				if(_children[i].nodeKind() == "text")
-					list.list.appendChild(_attributes[i]);
+					list.appendChild(_attributes[i]);
 			}
 			list.targetObject = this;
 			return list;
@@ -1935,11 +1935,13 @@ package
 		 * @return 
 		 * 
 		 */
+		 /*
 		override public function toJSON(k:String):String
 		{
 			return this.name();
 		}
-		
+		*/
+
 		/**
 		 * Returns a string representation of the XML object.
 		 * 
@@ -2230,7 +2232,7 @@ package
 				strArr.push(ns.prefix);
 				strArr.push(":");
 			}
-			strArr.push(ns.localName);
+			strArr.push(name().localName);
 			strArr.push(">");
 
 			return strArr.join("");

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7ed59b56/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index c7f3c09..cacbfc1 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -113,8 +113,8 @@ package
 			var idxStr:String = "" + idx;
 			Object.defineProperty(this,idxStr,
 				{
-					get: function() { return _xmlArray[idx]; },
-					set: function(newValue:*) {
+					"get": function():* { return _xmlArray[idx]; },
+					"set": function(newValue:*):void {
 						var i:int;
 						if(newValue is XML)
 						{