tabulator-tables 5.0.3 → 5.0.8

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

@@ -2,10 +2,10 @@ import Module from '../../core/Module.js';
 import Helpers from '../../core/tools/Helpers.js';
 
 class MoveColumns extends Module{
-
+	
 	constructor(table){
 		super(table);
-
+		
 		this.placeholderElement = this.createPlaceholderElement();
 		this.hoverElement = false; //floating column header element
 		this.checkTimeout = false; //click check timeout holder
@@ -18,35 +18,36 @@ class MoveColumns extends Module{
 		this.autoScrollStep = 5; //auto scroll distance in pixels
 		this.autoScrollTimeout = false; //auto scroll timeout
 		this.touchMove = false;
-
+		
 		this.moveHover = this.moveHover.bind(this);
 		this.endMove = this.endMove.bind(this);
-
+		
 		this.registerTableOption("movableColumns", false); //enable movable columns
 	}
-
+	
 	createPlaceholderElement(){
 		var el = document.createElement("div");
-
+		
 		el.classList.add("tabulator-col");
 		el.classList.add("tabulator-col-placeholder");
-
+		
 		return el;
 	}
-
+	
 	initialize(){
-		this.subscribe("column-init", this.initializeColumn.bind(this));
+		if(this.table.options.movableColumns){
+			this.subscribe("column-init", this.initializeColumn.bind(this));
+		}
 	}
-
+	
 	initializeColumn(column){
 		var self = this,
 		config = {},
 		colEl;
-
+		
 		if(!column.modules.frozen){
-
 			colEl = column.getElement();
-
+			
 			config.mousemove = function(e){
 				if(column.parent === self.moving.parent){
 					if((((self.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(colEl).left) + self.table.columnManager.element.scrollLeft) > (column.getWidth() / 2)){
@@ -62,7 +63,7 @@ class MoveColumns extends Module{
 					}
 				}
 			}.bind(self);
-
+			
 			colEl.addEventListener("mousedown", function(e){
 				self.touchMove = false;
 				if(e.which === 1){
@@ -71,7 +72,7 @@ class MoveColumns extends Module{
 					}, self.checkPeriod);
 				}
 			});
-
+			
 			colEl.addEventListener("mouseup", function(e){
 				if(e.which === 1){
 					if(self.checkTimeout){
@@ -79,19 +80,19 @@ class MoveColumns extends Module{
 					}
 				}
 			});
-
+			
 			self.bindTouchEvents(column);
 		}
-
+		
 		column.modules.moveColumn = config;
 	}
-
+	
 	bindTouchEvents(column){
 		var colEl = column.getElement(),
 		startXMove = false, //shifting center position of the cell
 		dir = false,
 		currentCol, nextCol, prevCol, nextColWidth, prevColWidth, nextColWidthLast, prevColWidthLast;
-
+		
 		colEl.addEventListener("touchstart", (e) => {
 			this.checkTimeout = setTimeout(() => {
 				this.touchMove = true;
@@ -103,27 +104,27 @@ class MoveColumns extends Module{
 				nextColWidthLast = 0;
 				prevColWidthLast = 0;
 				startXMove = false;
-
+				
 				this.startMove(e, column);
 			}, this.checkPeriod);
 		}, {passive: true});
-
+		
 		colEl.addEventListener("touchmove", (e) => {
 			var halfCol, diff, moveToCol;
-
+			
 			if(this.moving){
 				this.moveHover(e);
-
+				
 				if(!startXMove){
 					startXMove = e.touches[0].pageX;
 				}
-
+				
 				diff = e.touches[0].pageX - startXMove;
-
+				
 				if(diff > 0){
 					if(nextCol && diff - nextColWidthLast > nextColWidth){
 						moveToCol = nextCol;
-
+						
 						if(moveToCol !== column){
 							startXMove = e.touches[0].pageX;
 							moveToCol.getElement().parentNode.insertBefore(this.placeholderElement, moveToCol.getElement().nextSibling);
@@ -133,7 +134,7 @@ class MoveColumns extends Module{
 				}else{
 					if(prevCol && -diff - prevColWidthLast >  prevColWidth){
 						moveToCol = prevCol;
-
+						
 						if(moveToCol !== column){
 							startXMove = e.touches[0].pageX;
 							moveToCol.getElement().parentNode.insertBefore(this.placeholderElement, moveToCol.getElement());
@@ -141,7 +142,7 @@ class MoveColumns extends Module{
 						}
 					}
 				}
-
+				
 				if(moveToCol){
 					currentCol = moveToCol;
 					nextCol = moveToCol.nextColumn();
@@ -153,7 +154,7 @@ class MoveColumns extends Module{
 				}
 			}
 		}, {passive: true});
-
+		
 		colEl.addEventListener("touchend", (e) => {
 			if(this.checkTimeout){
 				clearTimeout(this.checkTimeout);
@@ -163,41 +164,43 @@ class MoveColumns extends Module{
 			}
 		});
 	}
-
+	
 	startMove(e, column){
-		var element = column.getElement();
-
+		var element = column.getElement(),
+		headerElement = this.table.columnManager.getElement(),
+		headersElement = this.table.columnManager.getHeadersElement();
+		
 		this.moving = column;
 		this.startX = (this.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(element).left;
-
+		
 		this.table.element.classList.add("tabulator-block-select");
-
+		
 		//create placeholder
 		this.placeholderElement.style.width = column.getWidth() + "px";
 		this.placeholderElement.style.height = column.getHeight() + "px";
-
+		
 		element.parentNode.insertBefore(this.placeholderElement, element);
 		element.parentNode.removeChild(element);
-
+		
 		//create hover element
 		this.hoverElement = element.cloneNode(true);
 		this.hoverElement.classList.add("tabulator-moving");
-
+		
 		this.table.columnManager.getElement().appendChild(this.hoverElement);
-
+		
 		this.hoverElement.style.left = "0";
-		this.hoverElement.style.bottom = "0";
-
+		this.hoverElement.style.bottom = (headerElement.clientHeight - headersElement.offsetHeight) + "px";
+		
 		if(!this.touchMove){
 			this._bindMouseMove();
-
+			
 			document.body.addEventListener("mousemove", this.moveHover);
 			document.body.addEventListener("mouseup", this.endMove);
 		}
-
+		
 		this.moveHover(e);
 	}
-
+	
 	_bindMouseMove(){
 		this.table.columnManager.columnsByIndex.forEach(function(column){
 			if(column.modules.moveColumn.mousemove){
@@ -205,7 +208,7 @@ class MoveColumns extends Module{
 			}
 		});
 	}
-
+	
 	_unbindMouseMove(){
 		this.table.columnManager.columnsByIndex.forEach(function(column){
 			if(column.modules.moveColumn.mousemove){
@@ -213,65 +216,65 @@ class MoveColumns extends Module{
 			}
 		});
 	}
-
+	
 	moveColumn(column, after){
 		var movingCells = this.moving.getCells();
-
+		
 		this.toCol = column;
 		this.toColAfter = after;
-
+		
 		if(after){
 			column.getCells().forEach(function(cell, i){
 				var cellEl = cell.getElement(true);
-
-				if(cellEl.parentNode){
+				
+				if(cellEl.parentNode && movingCells[i]){
 					cellEl.parentNode.insertBefore(movingCells[i].getElement(), cellEl.nextSibling);
 				}
 			});
 		}else{
 			column.getCells().forEach(function(cell, i){
 				var cellEl = cell.getElement(true);
-
-				if(cellEl.parentNode){
+				
+				if(cellEl.parentNode && movingCells[i]){
 					cellEl.parentNode.insertBefore(movingCells[i].getElement(), cellEl);
 				}
 			});
 		}
 	}
-
+	
 	endMove(e){
 		if(e.which === 1 || this.touchMove){
 			this._unbindMouseMove();
-
+			
 			this.placeholderElement.parentNode.insertBefore(this.moving.getElement(), this.placeholderElement.nextSibling);
 			this.placeholderElement.parentNode.removeChild(this.placeholderElement);
 			this.hoverElement.parentNode.removeChild(this.hoverElement);
-
+			
 			this.table.element.classList.remove("tabulator-block-select");
-
+			
 			if(this.toCol){
 				this.table.columnManager.moveColumnActual(this.moving, this.toCol, this.toColAfter);
 			}
-
+			
 			this.moving = false;
 			this.toCol = false;
 			this.toColAfter = false;
-
+			
 			if(!this.touchMove){
 				document.body.removeEventListener("mousemove", this.moveHover);
 				document.body.removeEventListener("mouseup", this.endMove);
 			}
 		}
 	}
-
+	
 	moveHover(e){
 		var columnHolder = this.table.columnManager.getElement(),
 		scrollLeft = columnHolder.scrollLeft,
 		xPos = ((this.touchMove ? e.touches[0].pageX : e.pageX) - Helpers.elOffset(columnHolder).left) + scrollLeft,
 		scrollPos;
-
+		
 		this.hoverElement.style.left = (xPos - this.startX) + "px";
-
+		
 		if(xPos - scrollLeft < this.autoScrollMargin){
 			if(!this.autoScrollTimeout){
 				this.autoScrollTimeout = setTimeout(() => {
@@ -281,7 +284,7 @@ class MoveColumns extends Module{
 				}, 1);
 			}
 		}
-
+		
 		if(scrollLeft + columnHolder.clientWidth - xPos < this.autoScrollMargin){
 			if(!this.autoScrollTimeout){
 				this.autoScrollTimeout = setTimeout(() => {

package/src/js/modules/Page/Page.js

@@ -198,7 +198,8 @@ class Page extends Module{
 			margin = this.table.options.progressiveLoadScrollMargin || (element.clientHeight * 2);
 
 			if(diff < margin){
-				this.nextPage();
+				this.nextPage()
+				.catch(() => {}); //consume the exception thrown when on the last page
 			}
 		}
 	}

package/src/js/modules/ResponsiveLayout/ResponsiveLayout.js

@@ -290,10 +290,14 @@ class ResponsiveLayout extends Module{
 						},
 					};
 
+					function onRendered(callback){
+						callback();
+					}
+
 					output.push({
 						field: column.field,
 						title: column.definition.title,
-						value: column.modules.format.formatter.call(self.table.modules.format, mockCellComponent, column.modules.format.params)
+						value: column.modules.format.formatter.call(self.table.modules.format, mockCellComponent, column.modules.format.params, onRendered)
 					});
 				}else{
 					output.push({

package/src/js/modules/SelectRow/SelectRow.js

@@ -35,9 +35,9 @@ class SelectRow extends Module{
 			this.subscribe("row-init", this.initializeRow.bind(this));
 			this.subscribe("row-deleting", this.rowDeleted.bind(this));
 			this.subscribe("rows-wipe", this.clearSelectionData.bind(this));
-			this.subscribe("rows-retrieve", this.clearSelectionData.bind(this));
+			this.subscribe("rows-retrieve", this.rowRetrieve.bind(this));
 
-			if(this.table.options.selectable && this.table.options.selectablePersistence){
+			if(this.table.options.selectable && !this.table.options.selectablePersistence){
 				this.subscribe("data-refeshing", this.deselectRows.bind(this));
 			}
 		}
@@ -51,7 +51,6 @@ class SelectRow extends Module{
 		this._deselectRow(row, true);
 	}
 
-
 	clearSelectionData(silent){
 		this.selecting = false;
 		this.lastClickedRow = false;
@@ -300,6 +299,7 @@ class SelectRow extends Module{
 		var self = this,
 		rowCount;
 
+		console.trace("deselect")
 		if(typeof rows == "undefined"){
 
 			rowCount = self.selectedRows.length;

package/src/js/modules/Sort/Sort.js

@@ -206,7 +206,7 @@ class Sort extends Module{
 		if(this.table.options.sortMode === "remote"){
 			this.reloadData();
 		}else{
-			this.refreshData()
+			this.refreshData(true);
 		}
 
 		//TODO - Persist left position of row manager

package/src/js/modules/Sort/defaults/sorters/datetime.js

@@ -6,8 +6,9 @@ export default function(a, b, aRow, bRow, column, dir, params){
 	emptyAlign = 0;
 
 	if(typeof DT != "undefined"){
-		a = DT.fromFormat(a, format);
-		b = DT.fromFormat(b, format);
+		a = DT.fromFormat(String(a), format);
+		b = DT.fromFormat(String(b), format);
+
 		if(!a.isValid){
 			emptyAlign = !b.isValid ? 0 : -1;
 		}else if(!b.isValid){

package/src/scss/themes/bootstrap/tabulator_bootstrap3.scss

@@ -185,6 +185,15 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		background-color:$rowHoverBackground !important;
 	}
 
+	&.tabulator-selected{
+		background-color:$rowSelectedBackground !important;
+	}
+
+	&.tabulator-selected:hover{
+		background-color:$rowSelectedBackgroundHover !important;
+		cursor: pointer;
+	}
+
 	.tabulator-cell{
 		padding:$cellPadding;
 		border-right:none;

package/src/scss/themes/bulma/tabulator_bulma.scss

@@ -204,8 +204,12 @@ $footerBorderColor:$grey-lighter !default; //footer border color
 		background-color: inherit;
 	}
 
+	&.tabulator-selected{
+		background-color:$rowSelectedBackground !important;
+	}
+
 	&.tabulator-selected:hover{
-		background-color:darken($rowSelectedBackground, 10%);
+		background-color:darken($rowSelectedBackground, 10%) !important;
 	}
 
 	.tabulator-cell{

package/src/scss/themes/semanticui/tabulator_semanticui.scss

@@ -219,13 +219,9 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 	}
 
 	&.striped{
-		.tabulator-tableholder{
-			.tabulator-table{
-				.tabulator-row{
-					&:nth-child(even){
-						background-color: $basicTableStripedBackground !important;
-					}
-				}
+		.tabulator-row{
+			&:nth-child(even){
+				background-color: $basicTableStripedBackground;
 			}
 		}
 	}
@@ -488,6 +484,15 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		color: $activeColor !important;
 	}
 
+	&.tabulator-selected{
+		background-color:$rowSelectedBackground !important;
+	}
+
+	&.tabulator-selected:hover{
+		background-color:$rowSelectedBackgroundHover !important;
+		cursor: pointer;
+	}
+
 	&.tabulator-moving{
 		pointer-events: none !important;
 	}