diff --git a/tableExport.js b/tableExport.js
index 1bfaa0fc..1691c0e0 100644
--- a/tableExport.js
+++ b/tableExport.js
@@ -220,7 +220,9 @@ THE SOFTWARE.*/
$(this).filter(':visible').find('th').each(function(index,data) {
if ($(this).css('display') != 'none'){
if(defaults.ignoreColumn.indexOf(index) == -1){
- excel += "
" + parseString($(this))+ " | ";
+ colSpan = ($(this).prop('colSpan') > 0) ? $(this).prop('colSpan') : 1;
+ rowSpan = ($(this).prop('rowSpan') > 0) ? $(this).prop('rowSpan') : 1;
+ excel += "" + parseString($(this))+ " | ";
}
}
});
@@ -250,7 +252,8 @@ THE SOFTWARE.*/
if(defaults.consoleLog == 'true'){
console.log(excel);
}
-
+ var worksheetName = $(el).attr('data-name');
+ worksheetName = worksheetName != null && worksheetName != "" ? worksheetName : "worksheet";
var excelFile = "";
excelFile += "";
excelFile += "