fix issue with multiple data validations as described in #94 (comment)

natergj · Nov 12, 2017 · ff629a2 · ff629a2
1 parent 0962ba2
commit ff629a2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/source/lib/worksheet/classes/dataValidation.js b/source/lib/worksheet/classes/dataValidation.js
@@ -152,8 +152,13 @@ class DataValidation { // §18.3.1.32 dataValidation (Data Validation)
         this.promptTitle !== undefined ? valEle.att('promptTitle', this.promptTitle) : null;
         this.prompt !== undefined ? valEle.att('prompt', this.prompt) : null;
         this.sqref !== undefined ? valEle.att('sqref', this.sqref) : null;
-        this.formula1 !== undefined ? valEle.ele('formula1').text(cleanFormula(this.formula1)) : null;
-        this.formula2 !== undefined ? valEle.ele('formula2').text(cleanFormula(this.formula2)) : null;
+        if (this.formula1 !== undefined) {
+            valEle.ele('formula1').text(cleanFormula(this.formula1));
+            if (this.formula2 !== undefined) {
+                valEle.up();
+                valEle.ele('formula2').text(cleanFormula(this.formula2));
+            }
+        }
         valEle.up();
     }
 }
@@ -178,8 +183,8 @@ class DataValidationCollection { // §18.3.1.33 dataValidations (Data Validation
         let valsEle = ele.ele('dataValidations').att('count', this.length);
         this.items.forEach((val) => {
             val.addToXMLele(valsEle);
+            valsEle.up();
         });
-        valsEle.up();
     }
 }