Merge branch 'master' into 0.2

c4milo · c4milo · commit 17c637ad8494 · 2011-08-16T22:56:04.000-04:00
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1 @@
+node_modules
diff --git a/lib/xml2json.js b/lib/xml2json.js
@@ -39,7 +39,7 @@ function text(data) {
     if (!data.length) {
         return;
     }
-    currentObject['$t'] = data;
+    currentObject['$t'] = (currentObject['$t'] || "") + data;
 }
 
 function endElement(name) {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "version": "0.2.2",
     "author": "Andrew Turley",
     "email": "aturley@buglabs.net",
-    "description" : "Converts xml to json using node-expat.",
+    "description" : "Converts xml to json and viceverza, using node-expat.",
     "repository": "git://github.com/buglabs/node-xml2json.git", 
     "main": "index", 
     "contributors":[ {"name": "Camilo Aguilar", "email": "camilo@buglabs.net"}],

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ function text(data) {`
`39`	`39`	`if (!data.length) {`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`		`- currentObject['$t'] = data;`
	`42`	`+ currentObject['$t'] = (currentObject['$t'] \|\| "") + data;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`function endElement(name) {`