update ordering of font style children to resolve .NET validator errors

zhennann · Sep 30, 2018 · 8a247fd · 8a247fd
1 parent 9210c8e
commit 8a247fd
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/source/lib/style/classes/font.js b/source/lib/style/classes/font.js
@@ -81,16 +81,8 @@ class Font {
      */
     addToXMLele(fontXML) {
         let fEle = fontXML.ele('font');
-        fEle.ele('sz').att('val', this.size !== undefined ? this.size : 12);
-        fEle.ele('color').att('rgb', this.color !== undefined ? this.color : 'FF000000');
-        fEle.ele('name').att('val', this.name !== undefined ? this.name : 'Calibri');
-        if (this.family !== undefined) {
-            fEle.ele('family').att('val', types.fontFamily[this.family.toLowerCase()]);
-        }
-        if (this.scheme !== undefined) {
-            fEle.ele('scheme').att('val', this.scheme);
-        }
 
+        // Place styling elements first to avoid validation errors with .NET validator
         this.condense === true ? fEle.ele('condense') : null;
         this.extend === true ? fEle.ele('extend') : null;
         this.bold === true ? fEle.ele('b') : null;
@@ -101,6 +93,17 @@ class Font {
         this.underline === true ? fEle.ele('u') : null;
         this.vertAlign === true ? fEle.ele('vertAlign') : null;
 
+        fEle.ele('sz').att('val', this.size !== undefined ? this.size : 12);
+        fEle.ele('color').att('rgb', this.color !== undefined ? this.color : 'FF000000');
+        fEle.ele('name').att('val', this.name !== undefined ? this.name : 'Calibri');
+        if (this.family !== undefined) {
+            fEle.ele('family').att('val', types.fontFamily[this.family.toLowerCase()]);
+        }
+        if (this.scheme !== undefined) {
+            fEle.ele('scheme').att('val', this.scheme);
+        }
+
+
         return true;
     }