Merge pull request #231 from pookong/remove_empty_worksheet0

remove empty worksheet[0] from _worksheets
exceljs · Dec 2, 2016 · d20efed · d20efed
2 parents aaca364 + 788bb40
commit d20efed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/doc/workbook.js b/lib/doc/workbook.js
@@ -120,7 +120,7 @@ Workbook.prototype = {
 
   get worksheets() {
     // return a clone of _worksheets
-    return this._worksheets.filter(function(worksheet) { return worksheet; });
+    return this._worksheets.filter(Boolean);
   },
 
   eachSheet: function(iteratee) {
@@ -140,7 +140,7 @@ Workbook.prototype = {
       lastPrinted: this.lastPrinted,
       created: this.created,
       modified: this.modified,
-      worksheets: this._worksheets.map(function(worksheet) { return worksheet.model; }),
+      worksheets: this._worksheets.filter(Boolean).map(function(worksheet) { return worksheet.model; }),
       definedNames: this._definedNames.model,
       views: this.views,
       company: this.company,
@@ -189,4 +189,4 @@ Workbook.prototype = {
     this._definedNames.model = value.definedNames;
     this.views = value.views;
   }
-};
+};
diff --git a/lib/stream/xlsx/workbook-writer.js b/lib/stream/xlsx/workbook-writer.js
@@ -228,7 +228,7 @@ WorkbookWriter.prototype = {
     var self = this;
     return new Bluebird(function(resolve) {
       var model = {
-        worksheets: self._worksheets
+        worksheets: self._worksheets.filter(Boolean)
       };
       var xform = new ContentTypesXform();
       var xml = xform.toXml(model);
@@ -240,7 +240,7 @@ WorkbookWriter.prototype = {
     var self = this;
     return new Bluebird(function(resolve) {
       var model = {
-        worksheets: self._worksheets
+        worksheets: self._worksheets.filter(Boolean)
       };
       var xform = new AppXform();
       var xml = xform.toXml(model);
@@ -300,7 +300,7 @@ WorkbookWriter.prototype = {
   addWorkbook: function() {
     var zip = this.zip;
     var model = {
-      worksheets: this._worksheets,
+      worksheets: this._worksheets.filter(Boolean),
       definedNames: this._definedNames.model,
       views: this.views
     };