Skip to content
This repository has been archived by the owner on Jul 25, 2021. It is now read-only.

Commit

Permalink
v5.0.0-rc.9 - enhancement: Excel cell merge support, closes #69
Browse files Browse the repository at this point in the history
  • Loading branch information
clarketm committed Jun 24, 2017
1 parent f37668b commit a0eaaaa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dist/js/tableexport.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
if (!_isValidFormat(key)) {
return _handleError('"' + key + '" is not a valid format. \nFormats: ' + _FORMAT_LIST.join(', '))
} else if (!_hasDependencies(key)) {
// TODO: provide a fallback option to XLS?
return _handleError('"' + key + '" requires "js-xlsx".');
} else if (!formatMap[key]) {
context.setExportData(self.exporters.build.call(self, context, key));
Expand Down Expand Up @@ -569,6 +570,7 @@
var dataURI = 'data:' + mime + ';' + this.charset + ',' + data;
this.downloadDataURI(dataURI, name, extension);
} else {
// TODO: error and fallback when `saveAs` not available
saveAs(new Blob([data],
{type: mime + ';' + this.charset}),
name + extension, true);
Expand Down
2 changes: 2 additions & 0 deletions src/stable/js/tableexport.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
if (!_isValidFormat(key)) {
return _handleError('"' + key + '" is not a valid format. \nFormats: ' + _FORMAT_LIST.join(', '))
} else if (!_hasDependencies(key)) {
// TODO: provide a fallback option to XLS?
return _handleError('"' + key + '" requires "js-xlsx".');
} else if (!formatMap[key]) {
context.setExportData(self.exporters.build.call(self, context, key));
Expand Down Expand Up @@ -569,6 +570,7 @@
var dataURI = 'data:' + mime + ';' + this.charset + ',' + data;
this.downloadDataURI(dataURI, name, extension);
} else {
// TODO: error and fallback when `saveAs` not available
saveAs(new Blob([data],
{type: mime + ';' + this.charset}),
name + extension, true);
Expand Down

0 comments on commit a0eaaaa

Please sign in to comment.