tabulator-tables 5.2.7 → 5.3.2

package/src/js/modules/Import/Import.js

@@ -4,187 +4,186 @@ import defaultImporters from './defaults/importers.js';
 
 class Import extends Module{
     
-    constructor(table){
-        super(table);
+	constructor(table){
+		super(table);
         
-        this.registerTableOption("importFormat");
-        this.registerTableOption("importReader", "text");
-    }
+		this.registerTableOption("importFormat");
+		this.registerTableOption("importReader", "text");
+	}
     
-    initialize(){
-        this.registerTableFunction("import", this.importFromFile.bind(this));
-
-        if(this.table.options.importFormat){
-            this.subscribe("data-loading", this.loadDataCheck.bind(this), 10);
-            this.subscribe("data-load", this.loadData.bind(this), 10);
-        }
-    }
-
-    loadDataCheck(data){
-        return typeof data === "string";
-    }
-
-    loadData(data, params, config, silent, previousData){
-        return this.importData(this.lookupImporter(), data)
-        .then(this.structureData.bind(this))
-        .catch((err) => {
-            console.error("Import Error:", err || "Unable to import data")
-            return Promise.reject(err);
-        })
-    }
-
-    lookupImporter(importFormat){
-        var importer;
+	initialize(){
+		this.registerTableFunction("import", this.importFromFile.bind(this));
+
+		if(this.table.options.importFormat){
+			this.subscribe("data-loading", this.loadDataCheck.bind(this), 10);
+			this.subscribe("data-load", this.loadData.bind(this), 10);
+		}
+	}
+
+	loadDataCheck(data){
+		return this.table.options.importFormat && (typeof data === "string" || (Array.isArray(data) && data.length && Array.isArray(data)));
+	}
+
+	loadData(data, params, config, silent, previousData){
+		return this.importData(this.lookupImporter(), data)
+			.then(this.structureData.bind(this))
+			.catch((err) => {
+				console.error("Import Error:", err || "Unable to import data");
+				return Promise.reject(err);
+			});
+	}
+
+	lookupImporter(importFormat){
+		var importer;
         
-        if(!importFormat){
-            importFormat = this.table.options.importFormat;
-        }
+		if(!importFormat){
+			importFormat = this.table.options.importFormat;
+		}
         
-        if(typeof importFormat === "string"){
-            importer = Import.importers[importFormat];
-        }else{
-            importer = importFormat;
-        }
-
-        if(!importer){
-            console.error("Import Error - Importer not found:", importFormat);
-        }
+		if(typeof importFormat === "string"){
+			importer = Import.importers[importFormat];
+		}else{
+			importer = importFormat;
+		}
+
+		if(!importer){
+			console.error("Import Error - Importer not found:", importFormat);
+		}
         
-        return importer;
-    }
+		return importer;
+	}
     
-    importFromFile(importFormat, extension){
-        var importer = this.lookupImporter(importFormat);
+	importFromFile(importFormat, extension){
+		var importer = this.lookupImporter(importFormat);
         
-        if(importer){
-            return this.pickFile(extension)
-            .then(this.importData.bind(this, importer))
-            .then(this.structureData.bind(this))
-            .then(this.setData.bind(this))
-            .catch((err) => {
-                console.error("Import Error:", err || "Unable to import file")
-                return Promise.reject(err);
-            })
-        }
-    }
+		if(importer){
+			return this.pickFile(extension)
+				.then(this.importData.bind(this, importer))
+				.then(this.structureData.bind(this))
+				.then(this.setData.bind(this))
+				.catch((err) => {
+					console.error("Import Error:", err || "Unable to import file");
+					return Promise.reject(err);
+				});
+		}
+	}
     
-    pickFile(extensions){
-        return new Promise((resolve, reject) => {
-            var input = document.createElement("input");
-            input.type = "file";
-            input.accept = extensions;
+	pickFile(extensions){
+		return new Promise((resolve, reject) => {
+			var input = document.createElement("input");
+			input.type = "file";
+			input.accept = extensions;
             
-            input.addEventListener("change", (e) => {
-                var file = input.files[0],
-                reader = new FileReader(),
-                data;
+			input.addEventListener("change", (e) => {
+				var file = input.files[0],
+				reader = new FileReader();
                 
-                switch(this.table.options.importReader){
-                    case "buffer":
-                        reader.readAsArrayBuffer(file);
-                    break;
-
-                    case "binary":
-                        reader.readAsBinaryString(file);
-                    break;
-
-                    case "url":
-                        reader.readAsDataURL(file);
-                    break;
-
-                    case "text":
-                    default:
-                        reader.readAsText(file);
-                }
+				switch(this.table.options.importReader){
+					case "buffer":
+						reader.readAsArrayBuffer(file);
+						break;
+
+					case "binary":
+						reader.readAsBinaryString(file);
+						break;
+
+					case "url":
+						reader.readAsDataURL(file);
+						break;
+
+					case "text":
+					default:
+						reader.readAsText(file);
+				}
                   
-                reader.onload = (e) => {
-                    resolve(reader.result)
-                };
+				reader.onload = (e) => {
+					resolve(reader.result);
+				};
                 
-                reader.onerror = (e) => {
-                    console.warn("File Load Error - Unable to read file");
-                    reject();
-                };
-            });
+				reader.onerror = (e) => {
+					console.warn("File Load Error - Unable to read file");
+					reject();
+				};
+			});
             
-            input.click();
-        });
-    }
+			input.click();
+		});
+	}
     
-    importData(importer, fileContents){
-        var data = importer.call(this.table, fileContents);
+	importData(importer, fileContents){
+		var data = importer.call(this.table, fileContents);
         
-        if(data instanceof Promise){
-            return data;
-        }else{
-            return data ? Promise.resolve(data) : Promise.reject();
-        }
-    }
-
-    structureData(parsedData){
-        var data = [];
+		if(data instanceof Promise){
+			return data;
+		}else{
+			return data ? Promise.resolve(data) : Promise.reject();
+		}
+	}
+
+	structureData(parsedData){
+		var data = [];
         
-        if(Array.isArray(parsedData) && parsedData.length && Array.isArray(parsedData[0])){
-            if(this.table.options.autoColumns){
-                data = this.structureArrayToObject(parsedData);
-            }else{
-                data = this.structureArrayToColumns(parsedData);
-            }
-
-            return data;
-        }else{
-            return parsedData;
-        }
-    }
-
-    structureArrayToObject(parsedData){
-        var columns = parsedData.shift();
-
-        var data = parsedData.map((values) => {
-            var row = {};
-
-            columns.forEach((key, i) => {
-                row[key] = values[i];
-            })
-
-            return row;
-        })
-
-        return data;
-    }
-
-    structureArrayToColumns(parsedData){
-        var data = [],
-        columns = this.table.getColumns();
-
-        //remove first row if it is the column names
-        if(columns[0] && parsedData[0][0]){
-            if(columns[0].getDefinition().title === parsedData[0][0]){
-                parsedData.shift();
-            }
-        }
+		if(Array.isArray(parsedData) && parsedData.length && Array.isArray(parsedData[0])){
+			if(this.table.options.autoColumns){
+				data = this.structureArrayToObject(parsedData);
+			}else{
+				data = this.structureArrayToColumns(parsedData);
+			}
+
+			return data;
+		}else{
+			return parsedData;
+		}
+	}
+
+	structureArrayToObject(parsedData){
+		var columns = parsedData.shift();
+
+		var data = parsedData.map((values) => {
+			var row = {};
+
+			columns.forEach((key, i) => {
+				row[key] = values[i];
+			});
+
+			return row;
+		});
+
+		return data;
+	}
+
+	structureArrayToColumns(parsedData){
+		var data = [],
+		columns = this.table.getColumns();
+
+		//remove first row if it is the column names
+		if(columns[0] && parsedData[0][0]){
+			if(columns[0].getDefinition().title === parsedData[0][0]){
+				parsedData.shift();
+			}
+		}
         
-        //convert row arrays to objects
-        parsedData.forEach((rowData) => {
-            var row = {};
+		//convert row arrays to objects
+		parsedData.forEach((rowData) => {
+			var row = {};
 
-            rowData.forEach((value, index) => {
-                var column = columns[index];
+			rowData.forEach((value, index) => {
+				var column = columns[index];
 
-                if(column){
-                    row[column.getField()] = value;
-                }
-            })
+				if(column){
+					row[column.getField()] = value;
+				}
+			});
 
-            data.push(row);
-        });
+			data.push(row);
+		});
 
-        return data;
-    }
+		return data;
+	}
     
-    setData(data){
-        return this.table.setData(data);
-    }
+	setData(data){
+		return this.table.setData(data);
+	}
 }
 
 Import.moduleName = "import";

package/src/js/modules/Import/defaults/importers/array.js

@@ -0,0 +1,5 @@
+function arrayImporter(input){
+	return input;
+}
+
+export default arrayImporter;

package/src/js/modules/Import/defaults/importers/csv.js

@@ -1,63 +1,63 @@
 function csvImporter(input){
-    var data = [],
-    row = 0, 
-    col = 0,
-    inQuote = false;
+	var data = [],
+	row = 0, 
+	col = 0,
+	inQuote = false;
     
-    //Iterate over each character
-    for (let index = 0; index < input.length; index++) {
-        let char = input[index], 
-        nextChar = input[index+1];      
+	//Iterate over each character
+	for (let index = 0; index < input.length; index++) {
+		let char = input[index], 
+		nextChar = input[index+1];      
         
-        //Initialize empty row
-        if(!data[row]){
-            data[row] = [];
-        }
+		//Initialize empty row
+		if(!data[row]){
+			data[row] = [];
+		}
 
-        //Initialize empty column
-        if(!data[row][col]){
-            data[row][col] = "";
-        }
+		//Initialize empty column
+		if(!data[row][col]){
+			data[row][col] = "";
+		}
         
-        //Handle quotation mark inside string
-        if (char == '"' && inQuote && nextChar == '"') { 
-            data[row][col] += char; 
-            index++;
-            continue; 
-        }
+		//Handle quotation mark inside string
+		if (char == '"' && inQuote && nextChar == '"') { 
+			data[row][col] += char; 
+			index++;
+			continue; 
+		}
         
-        //Begin / End Quote
-        if (char == '"') { 
-            inQuote = !inQuote;
-            continue;
-        }
+		//Begin / End Quote
+		if (char == '"') { 
+			inQuote = !inQuote;
+			continue;
+		}
         
-        //Next column (if not in quote)
-        if (char == ',' && !inQuote) { 
-            col++;
-            continue; 
-        }
+		//Next column (if not in quote)
+		if (char == ',' && !inQuote) { 
+			col++;
+			continue; 
+		}
         
-        //New row if new line and not in quote (CRLF) 
-        if (char == '\r' && nextChar == '\n' && !inQuote) { 
-            col = 0; 
-            row++; 
-            index++; 
-            continue; 
-        }
+		//New row if new line and not in quote (CRLF) 
+		if (char == '\r' && nextChar == '\n' && !inQuote) { 
+			col = 0; 
+			row++; 
+			index++; 
+			continue; 
+		}
         
-        //New row if new line and not in quote (CR or LF) 
-        if ((char == '\r' || char == '\n') && !inQuote) { 
-            col = 0;
-            row++;
-            continue; 
-        }
+		//New row if new line and not in quote (CR or LF) 
+		if ((char == '\r' || char == '\n') && !inQuote) { 
+			col = 0;
+			row++;
+			continue; 
+		}
 
-        //Normal Character, append to column
-        data[row][col] += char;
-    }
+		//Normal Character, append to column
+		data[row][col] += char;
+	}
 
-    return data;
+	return data;
 }
 
 export default csvImporter;

package/src/js/modules/Import/defaults/importers/json.js

@@ -1,8 +1,8 @@
 export default function(input){
-    try {
-        return JSON.parse(input);
-    } catch(e) {
-        console.warn("JSON Import Error - File contents is invalid JSON", e);
-        return Promise.reject();
-    }
+	try {
+		return JSON.parse(input);
+	} catch(e) {
+		console.warn("JSON Import Error - File contents is invalid JSON", e);
+		return Promise.reject();
+	}
 }

package/src/js/modules/Import/defaults/importers.js

@@ -1,7 +1,9 @@
 import csv from './importers/csv.js';
 import json from './importers/json.js';
+import array from './importers/array.js';
 
 export default {
 	csv:csv,
 	json:json,
+	array:array,
 };

package/src/js/modules/Interaction/Interaction.js

@@ -1,5 +1,4 @@
 import Module from '../../core/Module.js';
-import Helpers from '../../core/tools/Helpers.js';
 
 import Cell from '../../core/cell/Cell.js';
 import Column from '../../core/column/Column.js';
@@ -61,7 +60,7 @@ class Interaction extends Module{
 			groupTap:"group",
 			groupDblTap:"group",
 			groupTapHold:"group",
-		}
+		};
 
 		this.subscribers = {};
 
@@ -90,7 +89,7 @@ class Interaction extends Module{
 				tapDbl:null,
 				tapHold:null,
 			}
-		}
+		};
 
 		this.registerColumnOption("headerClick");
 		this.registerColumnOption("headerDblClick");
@@ -121,13 +120,15 @@ class Interaction extends Module{
 	initialize(){
 		this.initializeExternalEvents();
 
-		this.subscribe("column-init", this.initializeColumn.bind(this))
-		this.subscribe("cell-dblclick", this.cellContentsSelectionFixer.bind(this))
+		this.subscribe("column-init", this.initializeColumn.bind(this));
+		this.subscribe("cell-dblclick", this.cellContentsSelectionFixer.bind(this));
 	}
 
 	cellContentsSelectionFixer(e, cell){
+		var range;
+
 		if(this.table.modExists("edit")){
-			if (this.table.modules.edit.currentCell === this){
+			if (this.table.modules.edit.currentCell === cell){
 				return; //prevent instant selection of editor content
 			}
 		}
@@ -136,12 +137,12 @@ class Interaction extends Module{
 
 		try{
 			if (document.selection) { // IE
-				var range = document.body.createTextRange();
-				range.moveToElementText(this.element);
+				range = document.body.createTextRange();
+				range.moveToElementText(cell.getElement());
 				range.select();
 			} else if (window.getSelection) {
-				var range = document.createRange();
-				range.selectNode(this.element);
+				range = document.createRange();
+				range.selectNode(cell.getElement());
 				window.getSelection().removeAllRanges();
 				window.getSelection().addRange(range);
 			}
@@ -150,13 +151,11 @@ class Interaction extends Module{
 
 	initializeExternalEvents(){
 		for(let key in this.eventMap){
-			this.subscriptionChangeExternal(key, this.subscriptionChanged.bind(this, key))
+			this.subscriptionChangeExternal(key, this.subscriptionChanged.bind(this, key));
 		}
 	}
 
 	subscriptionChanged(key, added){
-		var index;
-
 		if(added){
 			if(!this.subscribers[key]){
 				if(this.eventMap[key].includes("-")){
@@ -194,7 +193,7 @@ class Interaction extends Module{
 	}
 
 	unsubscribeTouchEvents(key){
-		var notouch = true,
+		var noTouch = true,
 		type = this.eventMap[key];
 
 		if(this.subscribers[key] && !this.subscribedExternal(key)){
@@ -203,12 +202,12 @@ class Interaction extends Module{
 			for(let i in this.eventMap){
 				if(this.eventMap[i] === type){
 					if(this.subscribers[i]){
-						notouch = false;
+						noTouch = false;
 					}
 				}
 			}
 
-			if(notouch){
+			if(noTouch){
 				this.unsubscribe(type + "-touchstart", this.touchSubscribers[type + "-touchstart"]);
 				this.unsubscribe(type + "-touchend", this.touchSubscribers[type + "-touchend"]);
 
@@ -247,44 +246,44 @@ class Interaction extends Module{
 
 		switch(action){
 			case "start":
-			watchers.tap = true;
-
-			clearTimeout(watchers.tapHold);
+				watchers.tap = true;
 
-			watchers.tapHold = setTimeout(() => {
 				clearTimeout(watchers.tapHold);
-				watchers.tapHold = null;
 
-				watchers.tap = null;
-				clearTimeout(watchers.tapDbl);
-				watchers.tapDbl = null;
+				watchers.tapHold = setTimeout(() => {
+					clearTimeout(watchers.tapHold);
+					watchers.tapHold = null;
 
-				this.dispatchEvent(type + "TapHold", e,  component);
-			}, 1000);
-			break;
+					watchers.tap = null;
+					clearTimeout(watchers.tapDbl);
+					watchers.tapDbl = null;
 
-			case "end":
-			if(watchers.tap){
+					this.dispatchEvent(type + "TapHold", e,  component);
+				}, 1000);
+				break;
 
-				watchers.tap = null;
-				this.dispatchEvent(type + "Tap", e,  component);
-			}
+			case "end":
+				if(watchers.tap){
 
-			if(watchers.tapDbl){
-				clearTimeout(watchers.tapDbl);
-				watchers.tapDbl = null;
+					watchers.tap = null;
+					this.dispatchEvent(type + "Tap", e,  component);
+				}
 
-				this.dispatchEvent(type + "DblTap", e,  component);
-			}else{
-				watchers.tapDbl = setTimeout(() => {
+				if(watchers.tapDbl){
 					clearTimeout(watchers.tapDbl);
 					watchers.tapDbl = null;
-				}, 300);
-			}
 
-			clearTimeout(watchers.tapHold);
-			watchers.tapHold = null;
-			break;
+					this.dispatchEvent(type + "DblTap", e,  component);
+				}else{
+					watchers.tapDbl = setTimeout(() => {
+						clearTimeout(watchers.tapDbl);
+						watchers.tapDbl = null;
+					}, 300);
+				}
+
+				clearTimeout(watchers.tapHold);
+				watchers.tapHold = null;
+				break;
 		}
 	}