Merge remote-tracking branch 'origin/master'

nashwaan · Oct 3, 2017 · ad921da · ad921da
2 parents 6c99e85 + 440f39a
commit ad921da
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/lib/js2xml.js b/lib/js2xml.js
@@ -199,8 +199,19 @@ function hasContentCompact(element, options, anyContent) {
 
 function writeElementCompact(element, name, options, depth, indent) {
     var xml = '';
+    if (typeof element === 'undefined' || element === null) {
+        if (options.fullTagEmptyElement) {
+            return '<' + name + '></' + name + '>';
+        } else {
+            return '';
+        }
+    }
     if (name) {
         xml += '<' + name;
+        if (typeof element !== 'object') {
+            xml += '>' + writeText(element,options) + '</' + name + '>';
+            return xml;
+        }
         if (element[options.attributesKey]) {
             xml += writeAttributes(element[options.attributesKey], options, depth);
         }