From 797226d8b3b56c4a33919443562030ae3003bd85 Mon Sep 17 00:00:00 2001 From: quentin Date: Fri, 25 Aug 2017 12:27:56 -0700 Subject: [PATCH 1/3] Fix Export Mozilla Firefox --- kayalshri-table-export.jquery.plugin-a891806/table-export.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kayalshri-table-export.jquery.plugin-a891806/table-export.js b/kayalshri-table-export.jquery.plugin-a891806/table-export.js index ee711a2..e11b685 100644 --- a/kayalshri-table-export.jquery.plugin-a891806/table-export.js +++ b/kayalshri-table-export.jquery.plugin-a891806/table-export.js @@ -77,6 +77,7 @@ THE SOFTWARE.*/ var base64data = "base64," + $.base64.encode(tdData); var doc = document.createElement("a"); + document.body.appendChild(doc); doc.target = '_blank'; doc.download = defaults.tableName+'.'+defaults.type; doc.href = 'data:application/'+defaults.type+';filename=exportData;'+base64data; @@ -285,6 +286,7 @@ THE SOFTWARE.*/ //window.open('data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;' + base64data); var xls = document.createElement("a"); + document.body.appendChild(xls); xls.target = '_blank'; xls.download = defaults.tableName+'.xls'; xls.href = 'data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;'+base64data; From 2ed77b4176c06339b2a0a48a94f5e6e23db6ddb1 Mon Sep 17 00:00:00 2001 From: quentin Date: Mon, 28 Aug 2017 17:25:54 -0700 Subject: [PATCH 2/3] Make it work with IE --- .../table-export.js | 59 ++++++++++++------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/kayalshri-table-export.jquery.plugin-a891806/table-export.js b/kayalshri-table-export.jquery.plugin-a891806/table-export.js index e11b685..74efe0a 100644 --- a/kayalshri-table-export.jquery.plugin-a891806/table-export.js +++ b/kayalshri-table-export.jquery.plugin-a891806/table-export.js @@ -35,8 +35,9 @@ THE SOFTWARE.*/ consoleLog:'false' }; - var options = $.extend(defaults, options); - var el = this; + var options = $.extend(defaults, options), + el = this, + isIE = (navigator.userAgent.indexOf("MSIE") !== -1); if(defaults.type == 'csv' || defaults.type == 'txt'){ @@ -74,14 +75,23 @@ THE SOFTWARE.*/ if(defaults.consoleLog == 'true'){ console.log(tdData); } - var base64data = "base64," + $.base64.encode(tdData); - - var doc = document.createElement("a"); - document.body.appendChild(doc); - doc.target = '_blank'; - doc.download = defaults.tableName+'.'+defaults.type; - doc.href = 'data:application/'+defaults.type+';filename=exportData;'+base64data; - doc.click(); + var base64data = "base64," + $.base64.encode(tdData), + blob = new Blob([tdData], { type: 'text/csv' }); + + if (window.navigator.msSaveBlob) { // // IE hack; see http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx + window.navigator.msSaveOrOpenBlob(blob, 'exportData.csv'); + } + else { + var doc = document.createElement("a"); + document.body.appendChild(doc); + doc.target = '_blank'; + doc.download = defaults.tableName+'.'+defaults.type; + doc.href = 'data:application/'+defaults.type+';filename=exportData;'+base64data; + doc.click(); + } + + + }else if(defaults.type == 'sql'){ @@ -282,15 +292,24 @@ THE SOFTWARE.*/ excelFile += ""; excelFile += ""; - var base64data = "base64," + $.base64.encode(excelFile); - //window.open('data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;' + base64data); - - var xls = document.createElement("a"); - document.body.appendChild(xls); - xls.target = '_blank'; - xls.download = defaults.tableName+'.xls'; - xls.href = 'data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;'+base64data; - xls.click(); + //window.open('data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;' + base64data); + + var base64data = "base64," + $.base64.encode(excelFile), + blob = new Blob([excelFile], { type: 'xls' }); + + if (window.navigator.msSaveBlob) { // // IE hack; see http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx + window.navigator.msSaveOrOpenBlob(blob, 'exportData.xls'); + } + else { + var xls = document.createElement("a"); + document.body.appendChild(xls); + xls.target = '_blank'; + xls.download = defaults.tableName+'.xls'; + xls.href = 'data:application/vnd.ms-'+defaults.type+';filename=exportData.doc;'+base64data; + xls.click(); + } + + }else if(defaults.type == 'png'){ html2canvas($(el), { @@ -370,4 +389,4 @@ THE SOFTWARE.*/ } }); - })(jQuery); + })(jQuery); \ No newline at end of file From bef0c4331a83f1007569e6dc512451d1306e90a5 Mon Sep 17 00:00:00 2001 From: quentin Date: Mon, 28 Aug 2017 17:31:44 -0700 Subject: [PATCH 3/3] Forget --- kayalshri-table-export.jquery.plugin-a891806/table-export.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kayalshri-table-export.jquery.plugin-a891806/table-export.js b/kayalshri-table-export.jquery.plugin-a891806/table-export.js index 74efe0a..8774388 100644 --- a/kayalshri-table-export.jquery.plugin-a891806/table-export.js +++ b/kayalshri-table-export.jquery.plugin-a891806/table-export.js @@ -36,8 +36,7 @@ THE SOFTWARE.*/ }; var options = $.extend(defaults, options), - el = this, - isIE = (navigator.userAgent.indexOf("MSIE") !== -1); + el = this; if(defaults.type == 'csv' || defaults.type == 'txt'){