Version 1.1.3

Fix #5
See changelog

Author: JDMCreator

readme.md

@@ -1,6 +1,6 @@
 ## LaTeX Table Editor ##
 
-**Version 1.1.2**
+**Version 1.1.3**
 
 This is the GitHub page of an Open Source WYSIWYG table editor that exports to multiples languages including LaTeX, Plain TeX, CSV, HTML, BBCode, Eplain, PreTeXt and Markdown.
 

src/changelog.txt

@@ -7,6 +7,21 @@ Legend
 Dates use a YYYY/MM/DD format.
 
 
+Version 1.1.3 (2018/05/14)
+===========
+
+| Note on this release :
+|     Bug fixes
+
+LATEX IMPORT
+
+[#] Fixed issue where cells with \multirow and a negative argument would disappears (#5)
+
+EPLAIN EXPORT
+
+[#] Characters "\" and "~" were not well encoded
+[#] Characters ">" would disappears in the output
+
 Version 1.1.2 (2018/05/10)
 ===========
 

src/js.js

@@ -90,7 +90,7 @@ function $id(id) {
 			return "[rgb]{"+sep+"}";
 		},
 		table = new(function() {
-			this.version = "1.1";
+			this.version = "1.1.3";
 			this.create = function(cols, rows) {
 				rows = parseInt(rows, 10);
 				cols = parseInt(cols, 10);
@@ -300,27 +300,58 @@ function $id(id) {
 				else if(results.length > 0){
 					loadWorkbook(0);
 				}
+				sendGAEvent("Code", "importFile", "file");
 				table._id("excel-button").disabled = false;
 			}
-			this.importExcel = function(){
-				var file = this._id("excel-file").files[0],
-				elem_status = this._id('worksheet-loading-status');
-				if(file){
-				this._id("excel-button").disabled = true;
-				var excelWorker = function excelWorker(data, cb, th) {
-					var worker = new Worker("js/xlsxworker.js");
+			this.importExcel = function(file){
+				file = file || this._id("excel-file").files[0]
+				var elem_status = this._id('worksheet-loading-status');
+				if(file){	
+					this._id("excel-button").disabled = true;
+					var excelWorker = function excelWorker(data, cb, th) {
+						try{
+							var worker = new Worker("js/xlsxworker.js");
+						}
+						catch(e){
+							if(/origin.+null/.test(e.message)){
+								elem_status.innerHTML = "Impossible to load worksheets locally with this browser. Use another browser or load this page in a server.";
+							}
+							else{
+								console.error(e);
+								elem_status.innerHTML = "An unknown error occured";
+							}
+							document.getElementById("excel-button").disabled = false;
+							return false;
+						}
 						worker.onmessage = function(e) {
-							switch(e.data.t) {
-								case 'ready': break;
-								case 'e': console.error(e.data.d); break;
-								case 'xlsx': cb(e.data.d);worker.terminate(); break;
+							var t = e.data.t;
+							if(t == "e"){
+								console.error(e.data.d);
+								elem_status.innerHTML = "An error occured";
+								document.getElementById("excel-button").disabled = false;
+								worker.terminate();
+							}
+							else if(t == "xlsx"){
+								cb(e.data.d);
+								worker.terminate();
 							}
 						};
+						worker.onerror = function(e){
+							elem_status.innerHTML = "An error occured";
+							document.getElementById("excel-button").disabled = false;
+							console.error(e);
+						}
 						worker.postMessage({d:data,b:'binary'});
 					};
 					var reader = new FileReader(), _this = this;
 					reader.onload = function(e){
-						elem_status.innerHTML = "Converting...";
+						elem_status.innerHTML = 'Converting... <a href="#" id="worksheet-cancel">Cancel</a>';
+						document.getElementById("worksheet-cancel").addEventListener("click", function(e){
+							e.preventDefault();
+							worker.terminate();
+							document.getElementById("excel-button").disabled = false;
+							elem_status.innerHTML = "";
+						},false);
 						excelWorker(e.target.result, _this._importExcel);
 					};
 					reader.onprogress = function(e){
@@ -331,6 +362,7 @@ function $id(id) {
 					}
 					reader.onerror = function(e){
 						elem_status.innerHTML = "An error occured";
+						document.getElementById("excel-button").disabled = false;
 					}
 					reader.readAsBinaryString(file);
 				}
@@ -1455,7 +1487,8 @@ this.getHTML = (function(){
 				this.loaded = true;
 				this.element = table;
 				var _this = this,
-				waitingforpaste = false;
+				waitingforpaste = false,
+				waitingfortab = false;
 				$id("support-us").addEventListener("animationend",function(){
 					this.classList.remove("active");
 				}, false);
@@ -1487,11 +1520,73 @@ this.getHTML = (function(){
 				}, false);
 				table.addEventListener("click", function(e) {
 					var target = e.currentTarget;
+					waitingfortab = false;
 					if (target.tagName == "TD" || target.tagName == "TH") {
 						_this._clickCellManager.apply(this, arguments);
 					}
 				}, false);
-
+				table.addEventListener("focusin", function(e) {
+					if(waitingfortab){
+						waitingfortab = false;
+						var target = e.target;
+						do{
+							if(target.tagName == "TD" || target.tagName == "TH"){
+								break;
+							}
+						}
+						while(target = target.parentElement);
+						if(target){
+							_this._clickCellManager.apply(target, arguments);
+						}
+					}
+				}, false);
+				table.addEventListener("keydown", function(e){
+					e = window.event || e;
+					if(e.keyCode == 9 && !e.ctrlKey){
+						waitingfortab = true;
+					}
+				}, false);
+				this._id("worksheet-drop").addEventListener("drop", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+					this.classList.remove("dragover");
+					var file;
+					if(e.dataTransfer.items){
+						for(var i=0;i<e.dataTransfer.items.length;i++){
+							if(e.dataTransfer.items[i].kind == "file"){
+								file = e.dataTransfer.items[i].getAsFile();
+								break;
+							}
+						}
+					}
+					else{
+						file = e.dataTransfer.files[0];
+					}
+					if(file){
+						_this.importExcel(file);
+					}
+					if(e.dataTransfer.items){
+						e.dataTransfer.items.clear();
+					}
+					else{
+						e.dataTransfer.clearData();
+					}
+				}, false);
+				this._id("worksheet-drop").addEventListener("dragenter", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+					this.classList.add("dragover");
+				}, false);
+				this._id("worksheet-drop").addEventListener("dragover", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+					this.classList.add("dragover");
+				}, false);
+				this._id("worksheet-drop").addEventListener("dragleave", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+					this.classList.remove("dragover");
+				}, false);
 
 
 				document.execCommand("styleWithCSS", false, false);
@@ -1516,9 +1611,15 @@ this.getHTML = (function(){
 				var el = div.querySelectorAll("span.latex-equation");
 				var eq = []
 				for (var i = 0; i < el.length; i++) {
-					var kbd = document.createElement("kbd");
-					eq.push("$" + (el[i].innerText || el[i].textContent) + "$");
-					el[i].parentNode.replaceChild(kbd, el[i]);
+					var equation_text = (el[i].innerText || el[i].textContent);
+					if(/\S/.test(equation_text)){
+						var kbd = document.createElement("kbd");
+						eq.push("$" + equation_text + "$");
+						el[i].parentNode.replaceChild(kbd, el[i]);
+					}
+					else{
+						el[i].parentNode.removeChild(el[i]);
+					}
 				}
 				var ul = div.querySelectorAll("ul");
 				var ULs = []
@@ -2249,6 +2350,10 @@ this.getHTML = (function(){
 				else if(format == "html"){
 					src = "<!doctype>\n<html>\n<head>\n\t<title>Minimal Working Example</title>\n</head>\n<body>\n"+src+"\n</body>\n</html>";
 				}
+				else if(format == "wml"){
+					src = '<?xml version="1.0"?>\n<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.3//EN" "http://www.wapforum.org/DTD/wml13.dtd">\n<wml>\n<card id="page" title="Minimal Working Example">\n<p>\n' + src;
+					src += '\n</p>\n</card>\n</wml>';
+				}
 				element.value = src;
 			}
 			this.comparableHeader = function(before, middle, after) {
@@ -3381,12 +3486,7 @@ this.getHTML = (function(){
 						}
 					}
 				}
-console.dir({
-					complete: complete,
-					color : hasColor,
-					borders : border,
-					types : types
-				});
+
 				return callback.call(this, {
 					complete: complete,
 					color : hasColor,
@@ -3495,6 +3595,7 @@ console.dir({
 					if (arguments.length == 0) {
 						return ""
 					}
+					console.log(o.color);
 					var complete = o.complete,
 					hasColor = o.color,
 					borders = o.borders,

src/latex-import.js

@@ -512,22 +512,32 @@ var tabular = /\\begin{(tabu\*?|sidewaystable|table\*?|xtabular|longtable|mpxtab
 		var row = table[i],
 		pos = 0;
 		for(var j=0;j<row.length;j++){
-			var o = row[j];
+			var o = row[j],
+			o2;
 			if(o.rowSpan && Math.abs(o.rowSpan) != 1){
 				if(o.rowSpan < 0){
 					var span = Math.abs(o.rowSpan);
+					o.rowSpan = span;
 					for(var k=i-span+1;k<i+1;k++){
 						var row2 = table[k];
 						if(row2){
 							var pos2 = 0;
 							for(var h=0;h<row2.length;h++){
 								if(pos2 == pos){
 									if(k==i-span+1){
-										row2[h] = o;
+										row2[h] = {};
+										// Copy object
+										for(var f in o){
+											if(o.hasOwnProperty(f)){
+												row2[h][f] = o[f];
+											}
+										}
+										row2[h].rowSpan = span;
+										o2 = row2[h];
 									}
 									else{
 										row2[h].remove = true;
-										row2[h].refCell = o;
+										row2[h].refCell = o2;
 									}
 								}
 								pos2 += row[h].colSpan || 1;

src/toEplain.js

@@ -16,6 +16,7 @@
 		else{
 			latex+="\\hfill";
 		}
+		latex = latex.replace(/\\textbackslash\{\}/g, "{\\char`\\\\}");
 		return latex;
 	},
 	generateFromHTML = function(html, ignoreMultiline, align) {
@@ -71,6 +72,9 @@
 				else if(inside == """){
 					str += '"';
 				}
+				else if(inside == ">"){
+					str += "$>$";
+				}
 				i += inside.length-1;
 			}
 			else if(c == "\\"){
@@ -89,7 +93,7 @@
 				str += "\\P{}";
 			}
 			else if(c == "~"){
-				str += "\\textasciitilde{}";
+				str += "{\\char`\\~}";
 			}
 			else{
 				str+= c;