Skip to content

Commit

Permalink
Fixing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
guyonroche committed Aug 16, 2016
1 parent faf05db commit fd78896
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pids

# Test Output Folder
out/*
spec/out/*

# Tmp folder
tmp/*
Expand Down
9 changes: 2 additions & 7 deletions lib/stream/xlsx/worksheet-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,16 +394,13 @@ WorksheetWriter.prototype = {
//stringBufStack.push(xml);
},
_writeSheetProperties: function(xml, properties, pageSetup) {
console.log('_writeSheetProperties', properties, pageSetup)
var sheetPropertiesModel = {
tabColor: properties && properties.tabColor,
pageSetup: pageSetup && pageSetup.fitToPage ? {
fitToPage: pageSetup.fitToPage
} : undefined
};

console.log('_writeSheetProperties', sheetPropertiesModel);

xml.addText(xform.sheetProperties.toXml(sheetPropertiesModel));
},
_writeSheetFormatProperties: function(xml, properties) {
Expand All @@ -414,8 +411,6 @@ WorksheetWriter.prototype = {
outlineLevelRow: properties.outlineLevelRow
} : undefined;

console.log('_writeSheetFormatProperties', sheetFormatPropertiesModel);

xml.addText(xform.sheetFormatProperties.toXml(sheetFormatPropertiesModel));
},
_writeOpenWorksheet: function() {
Expand Down Expand Up @@ -489,10 +484,10 @@ WorksheetWriter.prototype = {
this.stream.write(xform.dataValidations.toXml(this.dataValidations.model));
},
_writePageMargins: function() {
xml.addText(xform.pageMargins.toXml(this.pageSetup.margins));
this.stream.write(xform.pageMargins.toXml(this.pageSetup.margins));
},
_writePageSetup: function() {
xml.addText(xform.pageMargins.toXml(this.pageSetup));
this.stream.write(xform.pageSeteup.toXml(this.pageSetup));
},
_writeDimensions: function() {
this._write('<dimension ref="' + this._dimensions + '"/>');
Expand Down
Empty file removed spec-out/README.md
Empty file.
2 changes: 1 addition & 1 deletion spec/integration/workbook-xlsx-writer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('WorkbookWriter', function() {
// return fsa.unlinkAsync('./wbw.test.xlsx').catch(function(){});
});

it.only('xlsx file', function() {
it('xlsx file', function() {
var options = {
filename: './wbw.test.xlsx',
useStyles: true
Expand Down
1 change: 1 addition & 0 deletions spec/out/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
output folder for specs
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
<dimension ref="A1:C7"/>
<sheetViews>
<sheetView workbookViewId="0" tabSelected="1"/>
<sheetView workbookViewId="0"/>
</sheetViews>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData>
Expand Down

0 comments on commit fd78896

Please sign in to comment.