Skip to content

Commit d20efed

Browse files
authored
Merge pull request #231 from pookong/remove_empty_worksheet0
remove empty worksheet[0] from _worksheets
2 parents aaca364 + 788bb40 commit d20efed

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/doc/workbook.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Workbook.prototype = {
120120

121121
get worksheets() {
122122
// return a clone of _worksheets
123-
return this._worksheets.filter(function(worksheet) { return worksheet; });
123+
return this._worksheets.filter(Boolean);
124124
},
125125

126126
eachSheet: function(iteratee) {
@@ -140,7 +140,7 @@ Workbook.prototype = {
140140
lastPrinted: this.lastPrinted,
141141
created: this.created,
142142
modified: this.modified,
143-
worksheets: this._worksheets.map(function(worksheet) { return worksheet.model; }),
143+
worksheets: this._worksheets.filter(Boolean).map(function(worksheet) { return worksheet.model; }),
144144
definedNames: this._definedNames.model,
145145
views: this.views,
146146
company: this.company,
@@ -189,4 +189,4 @@ Workbook.prototype = {
189189
this._definedNames.model = value.definedNames;
190190
this.views = value.views;
191191
}
192-
};
192+
};

lib/stream/xlsx/workbook-writer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ WorkbookWriter.prototype = {
228228
var self = this;
229229
return new Bluebird(function(resolve) {
230230
var model = {
231-
worksheets: self._worksheets
231+
worksheets: self._worksheets.filter(Boolean)
232232
};
233233
var xform = new ContentTypesXform();
234234
var xml = xform.toXml(model);
@@ -240,7 +240,7 @@ WorkbookWriter.prototype = {
240240
var self = this;
241241
return new Bluebird(function(resolve) {
242242
var model = {
243-
worksheets: self._worksheets
243+
worksheets: self._worksheets.filter(Boolean)
244244
};
245245
var xform = new AppXform();
246246
var xml = xform.toXml(model);
@@ -300,7 +300,7 @@ WorkbookWriter.prototype = {
300300
addWorkbook: function() {
301301
var zip = this.zip;
302302
var model = {
303-
worksheets: this._worksheets,
303+
worksheets: this._worksheets.filter(Boolean),
304304
definedNames: this._definedNames.model,
305305
views: this.views
306306
};

0 commit comments

Comments
 (0)