myphper
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎README.markdown‎
100644100755 b/‎README.markdown‎
100644100755
diff --git a/‎jquery.xml2json.iml‎
Lines changed: 0 additions & 11 deletions b/‎jquery.xml2json.iml‎
Lines changed: 0 additions & 11 deletions
diff --git a/‎js/xml2json.js‎
100644100755
Lines changed: 4 additions & 4 deletions b/‎js/xml2json.js‎
100644100755
Lines changed: 4 additions & 4 deletions
diff --git a/‎css/qunit.css‎ renamed to ‎tests/css/qunit.css‎ b/‎css/qunit.css‎ renamed to ‎tests/css/qunit.css‎
diff --git a/‎data/test.xml‎ renamed to ‎tests/data/test.xml‎
Lines changed: 3 additions & 0 deletions b/‎data/test.xml‎ renamed to ‎tests/data/test.xml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎index.html‎ renamed to ‎tests/index.html‎
Lines changed: 2 additions & 2 deletions b/‎index.html‎ renamed to ‎tests/index.html‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎js/jquery-1.7.1.js‎ renamed to ‎tests/js/jquery-1.7.1.js‎ b/‎js/jquery-1.7.1.js‎ renamed to ‎tests/js/jquery-1.7.1.js‎
diff --git a/‎js/qunit.js‎ renamed to ‎tests/js/qunit.js‎ b/‎js/qunit.js‎ renamed to ‎tests/js/qunit.js‎
diff --git a/‎js/index.js‎ renamed to ‎tests/js/tests.js‎
Lines changed: 11 additions & 0 deletions b/‎js/index.js‎ renamed to ‎tests/js/tests.js‎
Lines changed: 11 additions & 0 deletions
@@ -0,0 +1 @@
+*.iml
@@ -6,7 +6,7 @@
 (function(){
     jQuery.extend({
 
-        /**
+        /**w
          * Converts an xml response object from a $.ajax() call to a JSON object.
          *
          * @param xml
@@ -21,7 +21,7 @@
                     child = child == null ? {} : child;
 
                     if(result.hasOwnProperty(node.nodeName)) {
-                        // For repeating elements, cast the node to array
+                        // For repeating elements, cast/promote the node to array
                         if(!(result[node.nodeName] instanceof Array)){
                             var tmp = result[node.nodeName];
                             result[node.nodeName] = [];
@@ -37,13 +37,13 @@
                         result[node.nodeName]['@attributes'] = {};
                         for(var j in node.attributes) {
                             var attribute = node.attributes.item(j);
-                            result[node.nodeName]['@attributes'][attribute.nodeName] = attribute.nodeValue;
+                            child['@attributes'][attribute.nodeName] = attribute.nodeValue;
                         }
                     }
 
                     // Add element value
                     if(node.childElementCount == 0 && node.textContent != null && node.textContent != "") {
-                        result[node.nodeName].value = node.textContent.trim();
+                        child.value = node.textContent.trim();
                     }
                 }
             }
 
@@ -1,4 +1,7 @@
 <test library="jquery.xml2json" version="0.1">
+    <multiples>One</multiples>
     <lorem sticky="true">Lorem ipsum...     </lorem>
     <cdata><![CDATA[Some cdata block...]]></cdata>
+    <multiples>Two</multiples>
+    <multiples>Three</multiples>
 </test>
@@ -6,10 +6,10 @@
         <link rel="stylesheet" type="text/css" href="css/qunit.css"/>
 
         <script type="text/javascript" src="js/jquery-1.7.1.js"></script>
-        <script type="text/javascript" src="js/xml2json.js"></script>
+        <script type="text/javascript" src="../js/xml2json.js"></script>
         <script type="text/javascript" src="js/qunit.js"></script>
 
-        <script type="text/javascript" src="js/index.js"></script>
+        <script type="text/javascript" src="js/tests.js"></script>
     </head>
     <body>
         <h1 id="qunit-header">jquery.xml2json Test Suite</h1>
 
@@ -25,6 +25,17 @@ asyncTest("xml2json", function(){
                         },
                         value: 'Lorem ipsum...'
                     },
+                    "multiples": [
+                        {
+                            value: 'One'
+                        },
+                        {
+                            value: 'Two'
+                        },
+                        {
+                            value: 'Three'
+                        }
+                    ],
                     cdata: {
                         value: 'Some cdata block...'
                     }
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`(function(){`
`7`	`7`	`jQuery.extend({`
`8`	`8`
`9`		`- /**`
	`9`	`+ /**w`
`10`	`10`	`* Converts an xml response object from a $.ajax() call to a JSON object.`
`11`	`11`	`*`
`12`	`12`	`* @param xml`
`@@ -21,7 +21,7 @@`
`21`	`21`	`child = child == null ? {} : child;`
`22`	`22`
`23`	`23`	`if(result.hasOwnProperty(node.nodeName)) {`
`24`		`- // For repeating elements, cast the node to array`
	`24`	`+ // For repeating elements, cast/promote the node to array`
`25`	`25`	`if(!(result[node.nodeName] instanceof Array)){`
`26`	`26`	`var tmp = result[node.nodeName];`
`27`	`27`	`result[node.nodeName] = [];`
`@@ -37,13 +37,13 @@`
`37`	`37`	`result[node.nodeName]['@attributes'] = {};`
`38`	`38`	`for(var j in node.attributes) {`
`39`	`39`	`var attribute = node.attributes.item(j);`
`40`		`- result[node.nodeName]['@attributes'][attribute.nodeName] = attribute.nodeValue;`
	`40`	`+ child['@attributes'][attribute.nodeName] = attribute.nodeValue;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Add element value`
`45`	`45`	`if(node.childElementCount == 0 && node.textContent != null && node.textContent != "") {`
`46`		`- result[node.nodeName].value = node.textContent.trim();`
	`46`	`+ child.value = node.textContent.trim();`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`