tabulator-tables 5.0.9 → 5.1.2

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

@@ -0,0 +1,33 @@
+export default function(pageSize, currentRow, currentPage, totalRows, totalPages){
+
+    var el = document.createElement("span"),
+	showingEl = document.createElement("span"),
+	valueEl = document.createElement("span"),
+	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 = " " + currentPage + " ";
+	
+	this.table.modules.localize.langBind("pagination|counter|of", (value) => {
+		ofEl.innerHTML = value;
+	});
+	
+	totalEl.innerHTML = " " + totalPages + " ";
+	
+	this.table.modules.localize.langBind("pagination|counter|pages", (value) => {
+		rowsEl.innerHTML = value;
+	});
+	
+	el.appendChild(showingEl);
+	el.appendChild(valueEl);
+	el.appendChild(ofEl);
+	el.appendChild(totalEl);
+	el.appendChild(rowsEl);
+	
+	return el;
+};

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

@@ -0,0 +1,32 @@
+export default function(pageSize, currentRow, currentPage, totalRows, totalPages){
+	var el = document.createElement("span"),
+	showingEl = document.createElement("span"),
+	valueEl = document.createElement("span"),
+	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);
+	
+	return el;
+};

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

@@ -0,0 +1,8 @@
+import rows from './pageCounters/rows.js';
+import pages from './pageCounters/pages.js';
+
+
+export default {
+	rows:rows,
+	pages:pages,
+};

package/src/js/modules/Persistence/Persistence.js

@@ -131,11 +131,11 @@ class Persistence extends Module{
 				this.subscribe("column-show", this.save.bind(this, "columns"));
 				this.subscribe("column-hide", this.save.bind(this, "columns"));
 				this.subscribe("column-moved", this.save.bind(this, "columns"));
-				this.subscribe("table-built", this.tableBuilt.bind(this), 0);
 			}
 
-			this.subscribe("table-redraw", this.tableRedraw.bind(this));
+			this.subscribe("table-built", this.tableBuilt.bind(this), 0);
 
+			this.subscribe("table-redraw", this.tableRedraw.bind(this));
 
 			this.subscribe("filter-changed", this.eventSave.bind(this, "filter"));
 			this.subscribe("sort-changed", this.eventSave.bind(this, "sort"));
@@ -163,7 +163,7 @@ class Persistence extends Module{
 			sorters = this.load("sort");
 
 			if(!sorters === false){
-				this.table.initialSort = sorters;
+				this.table.options.initialSort = sorters;
 			}
 		}
 
@@ -171,7 +171,7 @@ class Persistence extends Module{
 			filters = this.load("filter");
 
 			if(!filters === false){
-				this.table.initialFilter = filters;
+				this.table.options.initialFilter = filters;
 			}
 		}
 	}
@@ -451,6 +451,8 @@ class Persistence extends Module{
 
 Persistence.moduleName = "persistence";
 
+Persistence.moduleInitOrder = 1;
+
 //load defaults
 Persistence.readers = defaultReaders;
 Persistence.writers = defaultWriters;

package/src/js/modules/ResizeRows/ResizeRows.js

@@ -86,7 +86,7 @@ class ResizeRows extends Module{
 
 			self.table.element.classList.remove("tabulator-block-select");
 
-			this.dispatchExternal("rowResized", row.getComponent());
+			self.dispatchExternal("rowResized", row.getComponent());
 		}
 
 		e.stopPropagation(); //prevent resize from interfereing with movable columns

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

@@ -21,7 +21,7 @@ class ResponsiveLayout extends Module{
 		this.registerColumnOption("responsive");
 	}
 
-	//generate resposive columns list
+	//generate responsive columns list
 	initialize(){
 		var self = this,
 		columns = [];
@@ -60,15 +60,15 @@ class ResponsiveLayout extends Module{
 		this.collapseStartOpen = this.table.options.responsiveLayoutCollapseStartOpen;
 		this.hiddenColumns = [];
 
-		//detemine level of responsivity for each column
-		this.table.columnManager.columnsByIndex.forEach(function(column, i){
+		//determine level of responsivity for each column
+		this.table.columnManager.columnsByIndex.forEach((column, i) => {
 			if(column.modules.responsive){
 				if(column.modules.responsive.order && column.modules.responsive.visible){
 					column.modules.responsive.index = i;
 					columns.push(column);
 
-					if(!column.visible && self.mode === "collapse"){
-						self.hiddenColumns.push(column);
+					if(!column.visible && this.mode === "collapse"){
+						this.hiddenColumns.push(column);
 					}
 				}
 			}
@@ -76,7 +76,7 @@ class ResponsiveLayout extends Module{
 
 		//sort list by responsivity
 		columns = columns.reverse();
-		columns = columns.sort(function(a, b){
+		columns = columns.sort((a, b) => {
 			var diff = b.modules.responsive.order - a.modules.responsive.order;
 			return diff || (b.modules.responsive.index - a.modules.responsive.index);
 		});
@@ -142,10 +142,8 @@ class ResponsiveLayout extends Module{
 	updateColumnVisibility(column, responsiveToggle){
 		if(!responsiveToggle && column.modules.responsive){
 			column.modules.responsive.visible = column.visible;
-			this.initialize();
+			this.initializeResponsivity();
 		}
-
-		//this.update();
 	}
 
 	hideColumn(column){
@@ -324,7 +322,7 @@ class ResponsiveLayout extends Module{
 			var titleHighlight = document.createElement("strong");
 			titleData.appendChild(titleHighlight);
 			this.langBind("columns|" + item.field, function(text){
-				titleHighlight.innerText = text || item.title;
+				titleHighlight.innerHTML = text || item.title;
 			});
 
 			if(item.value instanceof Node){

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

@@ -38,7 +38,7 @@ class SelectRow extends Module{
 			this.subscribe("rows-retrieve", this.rowRetrieve.bind(this));
 
 			if(this.table.options.selectable && !this.table.options.selectablePersistence){
-				this.subscribe("data-refeshing", this.deselectRows.bind(this));
+				this.subscribe("data-refreshing", this.deselectRows.bind(this));
 			}
 		}
 	}

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

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

package/src/js/modules/Validate/Validate.js

@@ -50,7 +50,7 @@ class Validate extends Module{
 	columnValidate(column){
 		var invalid = [];
 
-		column.cells.forEach(function(cell){
+		column.cells.forEach((cell) => {
 			if(!this.cellValidate(cell)){
 				invalid.push(cell.getComponent());
 			}
@@ -66,7 +66,7 @@ class Validate extends Module{
 	rowValidate(row){
 		var invalid = [];
 
-		row.cells.forEach(function(cell){
+		row.cells.forEach((cell) => {
 			if(!this.cellValidate(cell)){
 				invalid.push(cell.getComponent());
 			}
@@ -98,7 +98,9 @@ class Validate extends Module{
 		var output = [];
 
 		//clear row data
-		this.table.rowManager.rows.forEach(function(row){
+		this.table.rowManager.rows.forEach((row) => {
+			row = row.getComponent();
+
 			var valid = row.validate();
 
 			if(valid !== true){
@@ -128,7 +130,7 @@ class Validate extends Module{
 		if(column.definition.validator){
 
 			if(Array.isArray(column.definition.validator)){
-				column.definition.validator.forEach(function(item){
+				column.definition.validator.forEach((item) => {
 					validator = self._extractValidator(item);
 
 					if(validator){
@@ -197,7 +199,7 @@ class Validate extends Module{
 		invalidIndex = this.invalidCells.indexOf(cell);
 
 		if(validators){
-			validators.forEach(function(item){
+			validators.forEach((item) => {
 				if(!item.func.call(self, cell.getComponent(), value, item.params)){
 					valid.push({
 						type:item.type,

package/src/scss/tabulator.scss

@@ -392,15 +392,17 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 
 			width:100%;
 
-			span{
+			.tabulator-placeholder-contents {
 				display: inline-block;
+				text-align: center;
 
-				margin:0 auto;
 				padding:10px;
 
 				color:#ccc;
 				font-weight: bold;
 				font-size: 20px;
+
+				white-space: normal;
 			}
 		}
 
@@ -432,14 +434,11 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		}
 	}
 
-
-
 	//footer element
 	.tabulator-footer{
-		padding:5px 10px;
 		border-top:1px solid $footerSeperatorColor;
 		background-color: $footerBackgroundColor;
-		text-align: right;
+		
 		color: $footerTextColor;
 		font-weight:bold;
 		white-space:nowrap;
@@ -450,10 +449,22 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 		-webkit-user-select: none;
 		-o-user-select: none;
 
+		.tabulator-footer-contents {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+
+			padding:5px 10px;
+
+			&:empty{
+				display: none;
+			}
+		}
+
 		.tabulator-calcs-holder{
 			box-sizing:border-box;
 			width:calc(100% + 20px);
-			margin:-5px -10px 5px -10px;
 
 			text-align: left;
 
@@ -478,7 +489,19 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 			}
 		}
 
+		&>*+.tabulator-page-counter{
+			margin-left:10px;
+		}
+
+		.tabulator-page-counter {
+			font-weight: normal;
+		}
+
 		.tabulator-paginator{
+			flex:1;
+
+			text-align: right;
+			
 			color: $footerTextColor;
 			font-family:inherit;
 			font-weight:inherit;
@@ -1125,14 +1148,10 @@ $footerActiveColor:#d00 !default; //footer bottom active text color
 			}
 
 			.tabulator-col-content{
-				.tabulator-arrow{
+				.tabulator-col-sorter{
 					left:8px;
 					right:initial;
 				}
-				
-				.tabulator-col-sorter{
-					position: initial;
-				}
 			}
 		}
 	}

package/src/scss/themes/materialize/tabulator_materialize.scss

@@ -105,16 +105,17 @@ $footerActiveColor:$primary-color !default; //footer bottom active text color
 			margin-top:5px;
 			padding:8px 12px;
 
+			border-radius:0;
 			border-right:none;
 
 			background:rgba(255,255,255,.2);
 
-			&[data-page="first"]{
+			&[data-page="next"], &:first-of-type {
 				border-top-left-radius:4px;
 				border-bottom-left-radius:4px;
 			}
 
-			&[data-page="last"]{
+			&[data-page="prev"], &:last-of-type {
 				border:1px solid $footerBorderColor;
 				border-top-right-radius:4px;
 				border-bottom-right-radius:4px;
@@ -133,7 +134,7 @@ $footerActiveColor:$primary-color !default; //footer bottom active text color
 				background-color: $rowAltBackgroundColor;
 
 				&.tabulator-selected{
-					background-color:$rowSelectedBackground;
+					background-color:$rowSelectedBackground !important;
 				}
 
 				&.tabulator-selectable:hover{
@@ -142,7 +143,7 @@ $footerActiveColor:$primary-color !default; //footer bottom active text color
 				}
 
 				&.tabulator-selected:hover{
-					background-color:$rowSelectedBackgroundHover;
+					background-color:$rowSelectedBackgroundHover !important;
 					cursor: pointer;
 				}
 			}

package/src/scss/themes/tabulator_midnight.scss

@@ -90,6 +90,10 @@ $footerActiveColor:#fff !default; //footer bottom active text color
 			}
 		}
 
+		.tabulator-page-counter {
+			color: #fff;
+		}
+
 		//pagination button
 		.tabulator-page{
 			color: $footerTextColor;

package/src/scss/themes/tabulator_site.scss

@@ -124,6 +124,10 @@ $footerActiveColor:$footerSeperatorColor !default; //footer bottom active text c
 			}
 		}
 
+		.tabulator-page-counter{
+			color:#fff;
+		}
+
 		.tabulator-page{
 			background-color:#fff;