Bugfix: XMLParser children in ie #369, date form-control class #351 (#…

…373)
kevinchappell · Feb 22, 2017 · aa4216b · aa4216b
1 parent 74c1c35
commit aa4216b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/demo/assets/js/form-builder.min.js b/demo/assets/js/form-builder.min.js
diff --git a/demo/assets/js/form-render.min.js b/demo/assets/js/form-render.min.js
diff --git a/demo/assets/js/form-render.min.js.map b/demo/assets/js/form-render.min.js.map
diff --git a/src/js/form-builder.js b/src/js/form-builder.js
@@ -534,7 +534,13 @@
 
       field.name = isNew ? nameAttr(field) : ( field.name || nameAttr(field) );
 
-      if (isNew && utils.inArray(field.type, ['text', 'number', 'file', 'select', 'textarea'])) {
+      if (isNew && utils.inArray(field.type, [
+        'text',
+        'number',
+        'file',
+        'date',
+        'select',
+        'textarea'])) {
         field.className = 'form-control'; // backwards compatibility
       } else {
         field.className = field.class || field.className; // backwards compatibility

diff --git a/src/js/utils.js b/src/js/utils.js
@@ -238,8 +238,9 @@ fbUtils.parseXML = function(xmlString) {
     var fields = xml.getElementsByTagName('field');
     for (var i = 0; i < fields.length; i++) {
       let fieldData = fbUtils.parseAttrs(fields[i]);
+      let nodeChildren = fields[i].children || [];
 
-      if (fields[i].children && fields[i].children.length) {
+      if (nodeChildren.length) {
         fieldData.values = fbUtils.parseOptions(fields[i]);
       }