tabulator-tables 5.2.7 → 5.3.2

package/src/js/modules/Keybindings/Keybindings.js

@@ -25,8 +25,8 @@ class Keybindings extends Module{
 		this.pressedKeys = [];
 
 		if(bindings !== false){
-			Object.assign(mergedBindings, Keybindings.bindings)
-			Object.assign(mergedBindings, bindings)
+			Object.assign(mergedBindings, Keybindings.bindings);
+			Object.assign(mergedBindings, bindings);
 
 			this.mapBindings(mergedBindings);
 			this.bindEvents();
@@ -71,26 +71,26 @@ class Keybindings extends Module{
 		symbols.forEach((symbol) => {
 			switch(symbol){
 				case "ctrl":
-				binding.ctrl = true;
-				break;
+					binding.ctrl = true;
+					break;
 
 				case "shift":
-				binding.shift = true;
-				break;
+					binding.shift = true;
+					break;
 
 				case "meta":
-				binding.meta = true;
-				break;
+					binding.meta = true;
+					break;
 
 				default:
-				symbol = isNaN(symbol) ? symbol.toUpperCase().charCodeAt(0) : parseInt(symbol);
-				binding.keys.push(symbol);
+					symbol = isNaN(symbol) ? symbol.toUpperCase().charCodeAt(0) : parseInt(symbol);
+					binding.keys.push(symbol);
 
-				if(!this.watchKeys[symbol]){
-					this.watchKeys[symbol] = [];
-				}
+					if(!this.watchKeys[symbol]){
+						this.watchKeys[symbol] = [];
+					}
 
-				this.watchKeys[symbol].push(binding);
+					this.watchKeys[symbol].push(binding);
 			}
 		});
 	}

package/src/js/modules/Keybindings/defaults/actions.js

@@ -5,8 +5,7 @@ export default {
 	},
 	scrollPageUp:function(e){
 		var rowManager = this.table.rowManager,
-		newPos = rowManager.scrollTop - rowManager.element.clientHeight,
-		scrollMax = rowManager.element.scrollHeight;
+		newPos = rowManager.scrollTop - rowManager.element.clientHeight;
 
 		e.preventDefault();
 

package/src/js/modules/Layout/Layout.js

@@ -35,11 +35,10 @@ class Layout extends Module{
 	}
 
 	//trigger table layout
-	layout(){
-		this.dispatch("layout-refreshing")
-		Layout.modes[this.mode].call(this, this.table.columnManager.columnsByIndex);
-
-		this.dispatch("layout-refreshed")
+	layout(dataChanged){
+		this.dispatch("layout-refreshing");
+		Layout.modes[this.mode].call(this, this.table.columnManager.columnsByIndex, dataChanged);
+		this.dispatch("layout-refreshed");
 	}
 }
 

package/src/js/modules/Layout/defaults/modes/fitColumns.js

@@ -1,15 +1,15 @@
 //resize columns to fit
-export default function(columns){
-	var totalWidth = this.table.element.clientWidth; //table element width
+export default function(columns, forced){
+	var totalWidth = this.table.rowManager.element.getBoundingClientRect().width; //table element width
 	var fixedWidth = 0; //total width of columns with a defined width
 	var flexWidth = 0; //total width available to flexible columns
-	var flexGrowUnits = 0; //total number of widthGrow blocks accross all columns
+	var flexGrowUnits = 0; //total number of widthGrow blocks across all columns
 	var flexColWidth = 0; //desired width of flexible columns
 	var flexColumns = []; //array of flexible width columns
 	var fixedShrinkColumns = []; //array of fixed width columns that can shrink
-	var flexShrinkUnits = 0; //total number of widthShrink blocks accross all columns
+	var flexShrinkUnits = 0; //total number of widthShrink blocks across all columns
 	var overflowWidth = 0; //horizontal overflow width
-	var gapFill=0; //number of pixels to be added to final column to close and half pixel gaps
+	var gapFill = 0; //number of pixels to be added to final column to close and half pixel gaps
 
 	function calcWidth(width){
 		var colWidth;
@@ -29,7 +29,6 @@ export default function(columns){
 
 	//ensure columns resize to take up the correct amount of space
 	function scaleColumns(columns, freeSpace, colWidth, shrinkCols){
-
 		var oversizeCols = [],
 		oversizeSpace = 0,
 		remainingSpace = 0,
@@ -44,7 +43,7 @@ export default function(columns){
 		}
 
 		function calcShrink(col){
-			return  (calcWidth(col.width) - (colWidth * (col.column.definition.widthShrink || 0)))
+			return  (calcWidth(col.width) - (colWidth * (col.column.definition.widthShrink || 0)));
 		}
 
 		columns.forEach(function(col, i){
@@ -78,9 +77,7 @@ export default function(columns){
 
 			nextColWidth = changeUnits ? Math.floor(remainingSpace/changeUnits) : remainingSpace;
 
-			gap = remainingSpace - (nextColWidth * changeUnits);
-
-			gap += scaleColumns(undersizeCols, remainingSpace, nextColWidth, shrinkCols);
+			gap = scaleColumns(undersizeCols, remainingSpace, nextColWidth, shrinkCols);
 		}else{
 			gap = changeUnits ? freeSpace - (Math.floor(freeSpace/changeUnits) * changeUnits) : freeSpace;
 
@@ -137,17 +134,17 @@ export default function(columns){
 	flexWidth = totalWidth - fixedWidth;
 
 	//calculate correct column size
-	flexColWidth = Math.floor(flexWidth / flexGrowUnits)
+	flexColWidth = Math.floor(flexWidth / flexGrowUnits);
 
 	//generate column widths
-	var gapFill = scaleColumns(flexColumns, flexWidth, flexColWidth, false);
+	gapFill = scaleColumns(flexColumns, flexWidth, flexColWidth, false);
 
 	//increase width of last column to account for rounding errors
 	if(flexColumns.length && gapFill > 0){
-		flexColumns[flexColumns.length-1].width += + gapFill;
+		flexColumns[flexColumns.length-1].width += gapFill;
 	}
 
-	//caculate space for columns to be shrunk into
+	//calculate space for columns to be shrunk into
 	flexColumns.forEach(function(col){
 		flexWidth -= col.width;
 	});
@@ -160,7 +157,7 @@ export default function(columns){
 	}
 
 	//decrease width of last column to account for rounding errors
-	if(fixedShrinkColumns.length){
+	if(gapFill && fixedShrinkColumns.length){
 		fixedShrinkColumns[fixedShrinkColumns.length-1].width -= gapFill;
 	}
 
@@ -171,4 +168,4 @@ export default function(columns){
 	fixedShrinkColumns.forEach(function(col){
 		col.column.setWidth(col.width);
 	});
-};
+}

package/src/js/modules/Layout/defaults/modes/fitData.js

@@ -1,8 +1,10 @@
 //resize columns to fit data they contain
-export default function(columns){
-	this.table.columnManager.renderer.reinitializeColumnWidths(columns);
-
+export default function(columns, forced){
+	if(forced){
+		this.table.columnManager.renderer.reinitializeColumnWidths(columns);
+	}
+	
 	if(this.table.options.responsiveLayout && this.table.modExists("responsiveLayout", true)){
 		this.table.modules.responsiveLayout.update();
 	}
-};
+}

package/src/js/modules/Layout/defaults/modes/fitDataGeneral.js

@@ -1,5 +1,5 @@
 //resize columns to fit data they contain and stretch row to fill table, also used for fitDataTable
-export default function(columns){
+export default function(columns, forced){
 	columns.forEach(function(column){
 		column.reinitializeWidth();
 	});
@@ -7,4 +7,4 @@ export default function(columns){
 	if(this.table.options.responsiveLayout && this.table.modExists("responsiveLayout", true)){
 		this.table.modules.responsiveLayout.update();
 	}
-};
+}

package/src/js/modules/Layout/defaults/modes/fitDataStretch.js

@@ -1,5 +1,5 @@
 //resize columns to fit data the contain and stretch last column to fill table
-export default function(columns){
+export default function(columns, forced){
 	var colsWidth = 0,
 	tableWidth = this.table.rowManager.element.clientWidth,
 	gap = 0,
@@ -37,4 +37,4 @@ export default function(columns){
 			this.table.modules.responsiveLayout.update();
 		}
 	}
-};
+}

package/src/js/modules/Localize/Localize.js

@@ -36,7 +36,7 @@ class Localize extends Module{
 		this.registerTableFunction("getLang", this.getLang.bind(this));
 	}
 
-	//set header placehoder
+	//set header placeholder
 	setHeaderFilterPlaceholder(placeholder){
 		this.langList.default.headerFilters.default = placeholder;
 	}
@@ -62,7 +62,7 @@ class Localize extends Module{
 	_setLangProp(lang, values){
 		for(let key in values){
 			if(lang[key] && typeof lang[key] == "object"){
-				this._setLangProp(lang[key], values[key])
+				this._setLangProp(lang[key], values[key]);
 			}else{
 				lang[key] = values[key];
 			}
@@ -73,7 +73,7 @@ class Localize extends Module{
 	setLocale(desiredLocale){
 		desiredLocale = desiredLocale || "default";
 
-		//fill in any matching languge values
+		//fill in any matching language values
 		function traverseLang(trans, path){
 			for(var prop in trans){
 				if(typeof trans[prop] == "object"){
@@ -87,7 +87,7 @@ class Localize extends Module{
 			}
 		}
 
-		//determing correct locale to load
+		//determining correct locale to load
 		if(desiredLocale === true && navigator.language){
 			//get local from system
 			desiredLocale = navigator.language.toLowerCase();
@@ -134,8 +134,8 @@ class Localize extends Module{
 
 	//get text for current locale
 	getText(path, value){
-		var path = value ? path + "|" + value : path,
-		pathArray = path.split("|"),
+		var fillPath = value ? path + "|" + value : path,
+		pathArray = fillPath.split("|"),
 		text = this._getLangElement(pathArray, this.locale);
 
 		// if(text === false){
@@ -177,7 +177,7 @@ class Localize extends Module{
 		callback(this.getText(path), this.lang);
 	}
 
-	//itterate through bindings and trigger updates
+	//iterate through bindings and trigger updates
 	_executeBindings(){
 		for(let path in this.bindings){
 			this.bindings[path].forEach((binding) => {

package/src/js/modules/Menu/Menu.js

@@ -30,17 +30,15 @@ class Menu extends Module{
 	}
 	
 	initialize(){
-		this.deprecationCheck();
+		this.deprecatedOptionsCheck();
 		this.initializeRowWatchers();
 		this.initializeGroupWatchers();
 		
 		this.subscribe("column-init", this.initializeColumn.bind(this));
 	}
 
-	deprecationCheck(){
-		if(typeof this.table.options.menuContainer !== "undefined"){
-			console.warn("Use of the menuContainer option is now deprecated. Please use the popupContainer option instead");
-
+	deprecatedOptionsCheck(){
+		if(!this.deprecationCheck("menuContainer", "popupContainer")){
 			this.table.options.popupContainer = this.table.options.menuContainer;
 		}
 	}	
@@ -68,14 +66,13 @@ class Menu extends Module{
 	}
 	
 	initializeColumn(column){
-		var options = ["headerContextMenu", "headerClickMenu"],
-		def = column.definition;
+		var	def = column.definition;
 		
 		//handle column events
 		if(def.headerContextMenu && !this.columnSubscribers.headerContextMenu){
 			this.columnSubscribers.headerContextMenu = this.loadMenuTableColumnEvent.bind(this, "headerContextMenu");
 			this.subscribe("column-contextmenu", this.columnSubscribers.headerContextMenu);
-			this.table.on("headerTapHold", this.loadMenuTableColumnEvent.bind(this, "headerContextMenu"))
+			this.table.on("headerTapHold", this.loadMenuTableColumnEvent.bind(this, "headerContextMenu"));
 		}
 		
 		if(def.headerClickMenu && !this.columnSubscribers.headerClickMenu){
@@ -91,7 +88,7 @@ class Menu extends Module{
 		if(def.contextMenu && !this.columnSubscribers.contextMenu){
 			this.columnSubscribers.contextMenu = this.loadMenuTableCellEvent.bind(this, "contextMenu");
 			this.subscribe("cell-contextmenu", this.columnSubscribers.contextMenu);
-			this.table.on("cellTapHold", this.loadMenuTableCellEvent.bind(this, "contextMenu"))
+			this.table.on("cellTapHold", this.loadMenuTableCellEvent.bind(this, "contextMenu"));
 		}
 		
 		if(def.clickMenu && !this.columnSubscribers.clickMenu){
@@ -188,7 +185,7 @@ class Menu extends Module{
 			}else{
 				this.nestedMenuBlock = setTimeout(() => {
 					this.nestedMenuBlock = false;
-				}, 100)
+				}, 100);
 			}
 			
 			if(this.rootPopup){
@@ -271,7 +268,7 @@ class Menu extends Module{
 
 			this.currentComponent = component;
 
-			this.dispatchExternal("menuOpened", component.getComponent())
+			this.dispatchExternal("menuOpened", component.getComponent());
 		}
 	}
 }

package/src/js/modules/MoveColumns/MoveColumns.js

@@ -12,7 +12,7 @@ class MoveColumns extends Module{
 		this.checkPeriod = 250; //period to wait on mousedown to consider this a move and not a click
 		this.moving = false; //currently moving column
 		this.toCol = false; //destination column
-		this.toColAfter = false; //position of moving column relative to the desitnation column
+		this.toColAfter = false; //position of moving column relative to the destination column
 		this.startX = 0; //starting position within header element
 		this.autoScrollMargin = 40; //auto scroll on edge when within margin
 		this.autoScrollStep = 5; //auto scroll distance in pixels
@@ -90,13 +90,11 @@ class MoveColumns extends Module{
 	bindTouchEvents(column){
 		var colEl = column.getElement(),
 		startXMove = false, //shifting center position of the cell
-		dir = false,
-		currentCol, nextCol, prevCol, nextColWidth, prevColWidth, nextColWidthLast, prevColWidthLast;
+		nextCol, prevCol, nextColWidth, prevColWidth, nextColWidthLast, prevColWidthLast;
 		
 		colEl.addEventListener("touchstart", (e) => {
 			this.checkTimeout = setTimeout(() => {
 				this.touchMove = true;
-				currentCol = column;
 				nextCol = column.nextColumn();
 				nextColWidth = nextCol ? nextCol.getWidth()/2 : 0;
 				prevCol = column.prevColumn();
@@ -110,7 +108,7 @@ class MoveColumns extends Module{
 		}, {passive: true});
 		
 		colEl.addEventListener("touchmove", (e) => {
-			var halfCol, diff, moveToCol;
+			var diff, moveToCol;
 			
 			if(this.moving){
 				this.moveHover(e);
@@ -144,7 +142,6 @@ class MoveColumns extends Module{
 				}
 				
 				if(moveToCol){
-					currentCol = moveToCol;
 					nextCol = moveToCol.nextColumn();
 					nextColWidthLast = nextColWidth;
 					nextColWidth = nextCol ? nextCol.getWidth() / 2 : 0;

package/src/js/modules/MoveRows/MoveRows.js

@@ -12,7 +12,7 @@ class MoveRows extends Module{
 		this.checkPeriod = 150; //period to wait on mousedown to consider this a move and not a click
 		this.moving = false; //currently moving row
 		this.toRow = false; //destination row
-		this.toRowAfter = false; //position of moving row relative to the desitnation row
+		this.toRowAfter = false; //position of moving row relative to the destination row
 		this.hasHandle = false; //row has handle instead of fully movable row
 		this.startY = 0; //starting Y position within header element
 		this.startX = 0; //starting X position within header element
@@ -65,25 +65,26 @@ class MoveRows extends Module{
 
 	initializeGroupHeader(group){
 		var self = this,
-		config = {},
-		rowEl;
+		config = {};
 
 		//inter table drag drop
 		config.mouseup = function(e){
-			self.tableRowDrop(e, row);
+			self.tableRowDrop(e, group);
 		}.bind(self);
 
 		//same table drag drop
 		config.mousemove = function(e){
+			var rowEl;
+
 			if(((e.pageY - Helpers.elOffset(group.element).top) + self.table.rowManager.element.scrollTop) > (group.getHeight() / 2)){
 				if(self.toRow !== group || !self.toRowAfter){
-					var rowEl = group.getElement();
+					rowEl = group.getElement();
 					rowEl.parentNode.insertBefore(self.placeholderElement, rowEl.nextSibling);
 					self.moveRow(group, true);
 				}
 			}else{
 				if(self.toRow !== group || self.toRowAfter){
-					var rowEl = group.getElement();
+					rowEl = group.getElement();
 					if(rowEl.previousSibling){
 						rowEl.parentNode.insertBefore(self.placeholderElement, rowEl);
 						self.moveRow(group, false);
@@ -182,13 +183,11 @@ class MoveRows extends Module{
 
 	bindTouchEvents(row, element){
 		var startYMove = false, //shifting center position of the cell
-		dir = false,
-		currentRow, nextRow, prevRow, nextRowHeight, prevRowHeight, nextRowHeightLast, prevRowHeightLast;
+		nextRow, prevRow, nextRowHeight, prevRowHeight, nextRowHeightLast, prevRowHeightLast;
 
 		element.addEventListener("touchstart", (e) => {
 			this.checkTimeout = setTimeout(() => {
 				this.touchMove = true;
-				currentRow = row;
 				nextRow = row.nextRow();
 				nextRowHeight = nextRow ? nextRow.getHeight()/2 : 0;
 				prevRow = row.prevRow();
@@ -200,10 +199,10 @@ class MoveRows extends Module{
 				this.startMove(e, row);
 			}, this.checkPeriod);
 		}, {passive: true});
-		this.moving, this.toRow, this.toRowAfter
+		this.moving, this.toRow, this.toRowAfter;
 		element.addEventListener("touchmove", (e) => {
 
-			var halfCol, diff, moveToRow;
+			var diff, moveToRow;
 
 			if(this.moving){
 				e.preventDefault();
@@ -221,7 +220,7 @@ class MoveRows extends Module{
 						moveToRow = nextRow;
 
 						if(moveToRow !== row){
-							startYMove = e.touches[0].pageY
+							startYMove = e.touches[0].pageY;
 							moveToRow.getElement().parentNode.insertBefore(this.placeholderElement, moveToRow.getElement().nextSibling);
 							this.moveRow(moveToRow, true);
 						}
@@ -239,7 +238,6 @@ class MoveRows extends Module{
 				}
 
 				if(moveToRow){
-					currentRow = moveToRow;
 					nextRow = moveToRow.nextRow();
 					nextRowHeightLast = nextRowHeight;
 					nextRowHeight = nextRow ? nextRow.getHeight() / 2 : 0;
@@ -392,10 +390,9 @@ class MoveRows extends Module{
 	moveHoverTable(e){
 		var rowHolder = this.table.rowManager.getElement(),
 		scrollTop = rowHolder.scrollTop,
-		yPos = ((this.touchMove ? e.touches[0].pageY : e.pageY) - rowHolder.getBoundingClientRect().top) + scrollTop,
-		scrollPos;
-
-		this.hoverElement.style.top = (yPos - this.startY) + "px";
+		yPos = ((this.touchMove ? e.touches[0].pageY : e.pageY) - rowHolder.getBoundingClientRect().top) + scrollTop;
+		
+		this.hoverElement.style.top = Math.min(yPos - this.startY, this.table.rowManager.element.scrollHeight - this.hoverElement.offsetHeight) + "px";
 	}
 
 	moveHoverConnections(e){
@@ -496,7 +493,7 @@ class MoveRows extends Module{
 		}
 	}
 
-	//close incomming connection
+	//close incoming connection
 	disconnect(table){
 		if(table === this.connectedTable){
 			this.connectedTable = false;
@@ -514,7 +511,7 @@ class MoveRows extends Module{
 
 			this.dispatchExternal("movableRowsReceivingStop", table);
 		}else{
-			console.warn("Move Row Error - trying to disconnect from non connected table")
+			console.warn("Move Row Error - trying to disconnect from non connected table");
 		}
 	}
 
@@ -525,16 +522,16 @@ class MoveRows extends Module{
 
 			switch(typeof this.table.options.movableRowsSender){
 				case "string":
-				sender = this.senders[this.table.options.movableRowsSender];
-				break;
+					sender = this.senders[this.table.options.movableRowsSender];
+					break;
 
 				case "function":
-				sender = this.table.options.movableRowsSender;
-				break;
+					sender = this.table.options.movableRowsSender;
+					break;
 			}
 
 			if(sender){
-				sender.call(this, this.moving.getComponent(), row ? row.getComponent() : undefined, table)
+				sender.call(this, this.moving ? this.moving.getComponent() : undefined, row ? row.getComponent() : undefined, table);
 			}else{
 				if(this.table.options.movableRowsSender){
 					console.warn("Mover Row Error - no matching sender found:", this.table.options.movableRowsSender);
@@ -557,18 +554,18 @@ class MoveRows extends Module{
 
 		switch(typeof this.table.options.movableRowsReceiver){
 			case "string":
-			receiver = this.receivers[this.table.options.movableRowsReceiver];
-			break;
+				receiver = this.receivers[this.table.options.movableRowsReceiver];
+				break;
 
 			case "function":
-			receiver = this.table.options.movableRowsReceiver;
-			break;
+				receiver = this.table.options.movableRowsReceiver;
+				break;
 		}
 
 		if(receiver){
-			success = receiver.call(this, this.connectedRow.getComponent(), row ? row.getComponent() : undefined, this.connectedTable)
+			success = receiver.call(this, this.connectedRow.getComponent(), row ? row.getComponent() : undefined, this.connectedTable);
 		}else{
-			console.warn("Mover Row Error - no matching receiver found:", this.table.options.movableRowsReceiver)
+			console.warn("Mover Row Error - no matching receiver found:", this.table.options.movableRowsReceiver);
 		}
 
 		if(success){
@@ -586,16 +583,13 @@ class MoveRows extends Module{
 	commsReceived(table, action, data){
 		switch(action){
 			case "connect":
-			return this.connect(table, data.row);
-			break;
+				return this.connect(table, data.row);
 
 			case "disconnect":
-			return this.disconnect(table);
-			break;
+				return this.disconnect(table);
 
 			case "dropcomplete":
-			return this.dropComplete(table, data.row, data.success);
-			break;
+				return this.dropComplete(table, data.row, data.success);
 		}
 	}
 }

package/src/js/modules/Mutator/Mutator.js

@@ -7,7 +7,7 @@ class Mutator extends Module{
 	constructor(table){
 		super(table);
 
-		this.allowedTypes = ["", "data", "edit", "clipboard"]; //list of muatation types
+		this.allowedTypes = ["", "data", "edit", "clipboard"]; //list of mutation types
 		this.enabled = true;
 
 		this.registerColumnOption("mutator");
@@ -67,16 +67,16 @@ class Mutator extends Module{
 		//set column mutator
 		switch(typeof value){
 			case "string":
-			if(Mutator.mutators[value]){
-				mutator = Mutator.mutators[value];
-			}else{
-				console.warn("Mutator Error - No such mutator found, ignoring: ", value);
-			}
-			break;
+				if(Mutator.mutators[value]){
+					mutator = Mutator.mutators[value];
+				}else{
+					console.warn("Mutator Error - No such mutator found, ignoring: ", value);
+				}
+				break;
 
 			case "function":
-			mutator = value;
-			break;
+				mutator = value;
+				break;
 		}
 
 		return mutator;