tabulator-tables 5.1.2 → 5.1.5

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

@@ -575,17 +575,18 @@ class Page extends Module{
 		this.trackChanges();
 	}
 	
-	_setPageCounter(totalRows){
-		var content, currentRow;
+	_setPageCounter(totalRows, size, currentRow){
+		var content;
 		
 		if(this.pageCounter){
-			currentRow = ((this.page - 1) * this.size) + 1;
 
 			if(this.mode === "remote"){
+				size = this.size;
+				currentRow = ((this.page - 1) * this.size) + 1;
 				totalRows = this.remoteRowCountEstimate;
 			}
 
-			content = this.pageCounter.call(this, this.size, currentRow, this.page, totalRows, this.max);
+			content = this.pageCounter.call(this, size, currentRow, this.page, totalRows, this.max);
 			
 			switch(typeof content){
 				case "object":
@@ -725,7 +726,12 @@ class Page extends Module{
 	
 	//return appropriate rows for current page
 	getRows(data){
-		var output, start, end;
+		var actualRowPageSize = 0,
+		output, start, end, actualStartRow;
+
+		var actualRows = data.filter((row) => {
+			return row.type === "row";
+		});
 		
 		if(this.mode == "local"){
 			output = [];
@@ -740,21 +746,30 @@ class Page extends Module{
 				end = start + parseInt(this.size);
 			}
 			
-			
 			this._setPageButtons();
 			
 			for(let i = start; i < end; i++){
-				if(data[i]){
-					output.push(data[i]);
+				let row = data[i];
+
+				if(row){
+					output.push(row);
+
+					if(row.type === "row"){
+						if(!actualStartRow){
+							actualStartRow = row;
+						}	
+
+						actualRowPageSize++;
+					}
 				}
 			}
-
-			this._setPageCounter(data.length);
+			
+			this._setPageCounter(actualRows.length, actualRowPageSize, actualStartRow ? (actualRows.indexOf(actualStartRow) + 1) : 0);
 			
 			return output;
 		}else{
 			this._setPageButtons();
-			this._setPageCounter(data.length);
+			this._setPageCounter(actualRows.length);
 			
 			return data.slice(0);
 		}
@@ -857,8 +872,8 @@ class Page extends Module{
 	
 	//handle the footer element being redrawn
 	footerRedraw(){
-		var footer = this.table.footerManager.element;
-		
+		var footer = this.table.footerManager.containerElement;
+
 		if((Math.ceil(footer.clientWidth) - footer.scrollWidth) < 0){
 			this.pagesElement.style.display = 'none';
 		}else{

package/src/js/modules/Page/defaults/pageCounters/rows.js

@@ -5,28 +5,36 @@ export default function(pageSize, currentRow, currentPage, totalRows, totalPages
 	ofEl = document.createElement("span"),
 	totalEl = document.createElement("span"),
 	rowsEl = document.createElement("span");
-	
+
 	this.table.modules.localize.langBind("pagination|counter|showing", (value) => {
 		showingEl.innerHTML = value;
 	});
-	
-	valueEl.innerHTML = " " + currentRow + "-" + Math.min((currentRow + pageSize - 1), totalRows) + " ";
-	
+
 	this.table.modules.localize.langBind("pagination|counter|of", (value) => {
 		ofEl.innerHTML = value;
 	});
-	
-	totalEl.innerHTML = " " + totalRows + " ";
-	
+
 	this.table.modules.localize.langBind("pagination|counter|rows", (value) => {
 		rowsEl.innerHTML = value;
 	});
-	
-	el.appendChild(showingEl);
-	el.appendChild(valueEl);
-	el.appendChild(ofEl);
-	el.appendChild(totalEl);
-	el.appendChild(rowsEl);
+
+	if(totalRows){
+		valueEl.innerHTML = " " + currentRow + "-" + Math.min((currentRow + pageSize - 1), totalRows) + " ";
+		
+		totalEl.innerHTML = " " + totalRows + " ";
+		
+		el.appendChild(showingEl);
+		el.appendChild(valueEl);
+		el.appendChild(ofEl);
+		el.appendChild(totalEl);
+		el.appendChild(rowsEl);
+	}else{
+		valueEl.innerHTML = " 0 ";
+
+		el.appendChild(showingEl);
+		el.appendChild(valueEl);
+		el.appendChild(rowsEl);
+	}
 	
 	return el;
 };

package/src/js/modules/Persistence/defaults/readers.js

@@ -13,12 +13,12 @@ export default {
 
 		//if cookie exists, decode and load column data into tabulator
 		if(cookiePos > -1){
-			cookie = cookie.substr(cookiePos);
+			cookie = cookie.slice(cookiePos);
 
 			end = cookie.indexOf(";");
 
 			if(end > -1){
-				cookie = cookie.substr(0, end);
+				cookie = cookie.slice(0, end);
 			}
 
 			data = cookie.replace(key + "=", "");
@@ -26,4 +26,4 @@ export default {
 
 		return data ? JSON.parse(data) : false;
 	}
-};
+};

package/src/js/modules/ResizeColumns/ResizeColumns.js

@@ -1,186 +1,196 @@
 import Module from '../../core/Module.js';
 
 class ResizeColumns extends Module{
-
+	
 	constructor(table){
 		super(table);
-
+		
 		this.startColumn = false;
 		this.startX = false;
 		this.startWidth = false;
 		this.handle = null;
 		this.prevHandle = null;
-
+		
 		this.registerColumnOption("resizable", true);
 	}
-
+	
 	initialize(){
 		// if(this.table.options.resizableColumns){
-			this.subscribe("cell-layout", this.layoutCellHandles.bind(this));
-			this.subscribe("column-init", this.layoutColumnHeader.bind(this));
+		this.subscribe("cell-layout", this.layoutCellHandles.bind(this));
+		this.subscribe("column-init", this.layoutColumnHeader.bind(this));
 		// }
 	}
-
+	
 	layoutCellHandles(cell){
 		if(cell.row.type === "row"){
 			this.initializeColumn("cell", cell.column, cell.element);
 		}
 	}
-
+	
 	layoutColumnHeader(column){
 		this.initializeColumn("header", column, column.element);
 	}
-
+	
 	initializeColumn(type, column, element){
 		var self = this,
 		variableHeight = false,
 		mode = column.definition.resizable;
-
+		
 		//set column resize mode
 		if(type === "header"){
 			variableHeight = column.definition.formatter == "textarea" || column.definition.variableHeight;
 			column.modules.resize = {variableHeight:variableHeight};
 		}
-
+		
 		if(mode === true || mode == type){
-
+			
 			var handle = document.createElement('div');
 			handle.className = "tabulator-col-resize-handle";
-
-
+			
+			
 			var prevHandle = document.createElement('div');
 			prevHandle.className = "tabulator-col-resize-handle prev";
-
+			
 			handle.addEventListener("click", function(e){
 				e.stopPropagation();
 			});
-
+			
 			var handleDown = function(e){
 				var nearestColumn = column.getLastColumn();
-
+				
 				if(nearestColumn && self._checkResizability(nearestColumn)){
 					self.startColumn = column;
 					self._mouseDown(e, nearestColumn, handle);
 				}
 			};
-
+			
 			handle.addEventListener("mousedown", handleDown);
 			handle.addEventListener("touchstart", handleDown, {passive: true});
-
+			
 			//reszie column on  double click
 			handle.addEventListener("dblclick", function(e){
-				var col = column.getLastColumn();
-
+				var col = column.getLastColumn(),
+				oldWidth;
+				
 				if(col && self._checkResizability(col)){
+					oldWidth = col.getWidth();
+
 					e.stopPropagation();
 					col.reinitializeWidth(true);
+
+					if(oldWidth !== col.getWidth()){
+						self.dispatch("column-resized", col);
+						self.table.externalEvents.dispatch("columnResized", col.getComponent());
+					}
 				}
 			});
-
-
+			
+			
 			prevHandle.addEventListener("click", function(e){
 				e.stopPropagation();
 			});
-
+			
 			var prevHandleDown = function(e){
 				var nearestColumn, colIndex, prevColumn;
-
+				
 				nearestColumn = column.getFirstColumn();
-
+				
 				if(nearestColumn){
 					colIndex = self.table.columnManager.findColumnIndex(nearestColumn);
 					prevColumn = colIndex > 0 ? self.table.columnManager.getColumnByIndex(colIndex - 1) : false;
-
+					
 					if(prevColumn && self._checkResizability(prevColumn)){
 						self.startColumn = column;
 						self._mouseDown(e, prevColumn, prevHandle);
 					}
 				}
 			};
-
+			
 			prevHandle.addEventListener("mousedown", prevHandleDown);
 			prevHandle.addEventListener("touchstart", prevHandleDown, {passive: true});
-
+			
 			//resize column on double click
 			prevHandle.addEventListener("dblclick", function(e){
 				var nearestColumn, colIndex, prevColumn;
-
+				
 				nearestColumn = column.getFirstColumn();
-
+				
 				if(nearestColumn){
 					colIndex = self.table.columnManager.findColumnIndex(nearestColumn);
 					prevColumn = colIndex > 0 ? self.table.columnManager.getColumnByIndex(colIndex - 1) : false;
-
+					
 					if(prevColumn && self._checkResizability(prevColumn)){
 						e.stopPropagation();
 						prevColumn.reinitializeWidth(true);
 					}
 				}
 			});
-
+			
 			element.appendChild(handle);
 			element.appendChild(prevHandle);
 		}
 	}
-
+	
 	_checkResizability(column){
 		return column.definition.resizable;
 	}
-
+	
 	_mouseDown(e, column, handle){
 		var self = this;
-
+		
 		self.table.element.classList.add("tabulator-block-select");
 
 		function mouseMove(e){
 			// self.table.columnManager.tempScrollBlock();
-
+			
 			if(self.table.rtl){
 				column.setWidth(self.startWidth - ((typeof e.screenX === "undefined" ? e.touches[0].screenX : e.screenX) - self.startX));
 			}else{
 				column.setWidth(self.startWidth + ((typeof e.screenX === "undefined" ? e.touches[0].screenX : e.screenX) - self.startX));
 			}
-
+			
 			self.table.columnManager.renderer.rerenderColumns(true);
-
+			
 			if(!self.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
 				column.checkCellHeights();
 			}
 		}
-
+		
 		function mouseUp(e){
-
+			
 			//block editor from taking action while resizing is taking place
 			if(self.startColumn.modules.edit){
 				self.startColumn.modules.edit.blocked = false;
 			}
-
+			
 			if(self.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
 				column.checkCellHeights();
 			}
-
+			
 			document.body.removeEventListener("mouseup", mouseUp);
 			document.body.removeEventListener("mousemove", mouseMove);
-
+			
 			handle.removeEventListener("touchmove", mouseMove);
 			handle.removeEventListener("touchend", mouseUp);
-
+			
 			self.table.element.classList.remove("tabulator-block-select");
 
-			self.dispatch("column-resized", column);
-			self.table.externalEvents.dispatch("columnResized", column.getComponent());
+			if(self.startWidth !== column.getWidth()){
+				self.dispatch("column-resized", column);
+				self.table.externalEvents.dispatch("columnResized", column.getComponent());
+			}
 		}
-
+		
 		e.stopPropagation(); //prevent resize from interfereing with movable columns
-
+		
 		//block editor from taking action while resizing is taking place
 		if(self.startColumn.modules.edit){
 			self.startColumn.modules.edit.blocked = true;
 		}
-
+		
 		self.startX = typeof e.screenX === "undefined" ? e.touches[0].screenX : e.screenX;
 		self.startWidth = column.getWidth();
-
+		
 		document.body.addEventListener("mousemove", mouseMove);
 		document.body.addEventListener("mouseup", mouseUp);
 		handle.addEventListener("touchmove", mouseMove, {passive: true});