Skip to content

Commit

Permalink
update version number to 5.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
olifolkerd committed May 8, 2022
1 parent 39949ed commit ef7485e
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 24 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tabulator",
"main": "dist/js/tabulator.js",
"version": "5.2.3",
"version": "5.2.4",
"description": "Interactive table generation JavaScript library",
"keywords": [
"table",
Expand Down
71 changes: 58 additions & 13 deletions dist/js/tabulator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Tabulator v5.2.3 (c) Oliver Folkerd 2022 */
/* Tabulator v5.2.4 (c) Oliver Folkerd 2022 */
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
Expand Down Expand Up @@ -323,8 +323,8 @@

_createClass(CoreFeature, [{
key: "reloadData",
value: function reloadData(data, silent) {
return this.table.dataLoader.load(data, undefined, undefined, undefined, silent);
value: function reloadData(data, silent, columnsChanged) {
return this.table.dataLoader.load(data, undefined, undefined, undefined, silent, columnsChanged);
} //////////////////////////////////////////
///////////// Localization ///////////////
//////////////////////////////////////////
Expand Down Expand Up @@ -6691,7 +6691,7 @@
value: function initialize() {}
}, {
key: "load",
value: function load(data, params, config, replace, silent) {
value: function load(data, params, config, replace, silent, columnsChanged) {
var _this2 = this;

var requestNo = ++this.requestOrder;
Expand Down Expand Up @@ -6725,7 +6725,7 @@
if (rowData !== false) {
_this2.dispatchExternal("dataLoaded", rowData);

_this2.table.rowManager.setData(rowData, replace, !replace);
_this2.table.rowManager.setData(rowData, replace, typeof columnsChanged === "undefined" ? !replace : columnsChanged);
}
} else {
console.warn("Data Load Response Blocked - An active data load request was blocked by an attempt to change table data while the request was being made");
Expand All @@ -6752,7 +6752,7 @@
data = [];
}

this.table.rowManager.setData(data, replace, !replace);
this.table.rowManager.setData(data, replace, typeof columnsChanged === "undefined" ? !replace : columnsChanged);
return Promise.resolve();
}
}
Expand Down Expand Up @@ -11321,6 +11321,11 @@
value: function getTreeParent(row) {
return row.modules.dataTree.parent ? row.modules.dataTree.parent.getComponent() : false;
}
}, {
key: "getTreeParentRoot",
value: function getTreeParentRoot(row) {
return row.modules.dataTree.parent ? this.getTreeParentRoot(row.modules.dataTree.parent) : row;
}
}, {
key: "getFilteredTreeChildren",
value: function getFilteredTreeChildren(row) {
Expand Down Expand Up @@ -12961,7 +12966,7 @@
values = this._ajaxRequest(this.params.valuesURL, this.input.value);
} else {
if (typeof this.params.valuesLookup === "function") {
values = this.params.valuesLookup(cell, this.input.value);
values = this.params.valuesLookup(this.cell, this.input.value);
} else if (this.params.valuesLookup) {
values = this._uniqueColumnValues(this.params.valuesLookupField);
}
Expand Down Expand Up @@ -15954,7 +15959,7 @@
value: function refreshFilter() {
if (this.tableInitialized) {
if (this.table.options.filterMode === "remote") {
this.reloadData();
this.reloadData(null, false, false);
} else {
this.refreshData(true);
}
Expand Down Expand Up @@ -17384,7 +17389,8 @@
this.table.columnManager.headersElement.style.marginLeft = this.leftMargin;
this.table.columnManager.element.style.paddingRight = this.rightMargin;
this.leftColumns.forEach(function (column, i) {
column.modules.frozen.margin = leftMargin + _this4.table.columnManager.scrollLeft + "px";
column.modules.frozen.marginValue = leftMargin + _this4.table.columnManager.scrollLeft;
column.modules.frozen.margin = column.modules.frozen.marginValue + "px";

if (column.visible) {
leftMargin += column.getWidth();
Expand Down Expand Up @@ -17423,7 +17429,8 @@
rightMargin += column.getWidth();
}

column.modules.frozen.margin = _this4.rightPadding - rightMargin + "px";
column.modules.frozen.marginValue = _this4.rightPadding - rightMargin;
column.modules.frozen.margin = column.modules.frozen.marginValue + "px";

if (i == _this4.rightColumns.length - 1) {
column.modules.frozen.edge = true;
Expand Down Expand Up @@ -18830,6 +18837,11 @@
key: "getRowGroup",
value: function getRowGroup(row) {
var match = false;

if (this.options("dataTree")) {
row = this.table.modules.dataTree.getTreeParentRoot(row);
}

this.groupList.forEach(function (group) {
var result = group.getRowGroup(row);

Expand Down Expand Up @@ -24018,6 +24030,7 @@
this.subscribe("column-moved", this.columnLayoutUpdated.bind(this));
this.subscribe("column-hide", this.deInitializeColumn.bind(this));
this.subscribe("column-show", this.columnLayoutUpdated.bind(this));
this.subscribe("column-width", this.columnWidthUpdated.bind(this));
this.subscribe("column-delete", this.deInitializeComponent.bind(this));
this.subscribe("column-height", this.resizeHandle.bind(this));
this.initialized = true;
Expand Down Expand Up @@ -24050,16 +24063,42 @@
this.reinitializeColumn(prev);
}
}
}, {
key: "columnWidthUpdated",
value: function columnWidthUpdated(column) {
var _this2 = this;

if (column.modules.frozen) {
if (this.table.modules.frozenColumns.leftColumns.includes(column)) {
this.table.modules.frozenColumns.leftColumns.forEach(function (col) {
_this2.reinitializeColumn(col);
});
} else if (this.table.modules.frozenColumns.rightColumns.includes(column)) {
this.table.modules.frozenColumns.rightColumns.forEach(function (col) {
_this2.reinitializeColumn(col);
});
}
}
}
}, {
key: "reinitializeColumn",
value: function reinitializeColumn(column) {
var frozenOffset = column.modules.frozen ? column.modules.frozen.marginValue + column.getWidth() + "px" : false;
column.cells.forEach(function (cell) {
if (cell.modules.resize && cell.modules.resize.handleEl) {
if (frozenOffset) {
cell.modules.resize.handleEl.style.left = frozenOffset;
}

cell.element.after(cell.modules.resize.handleEl);
}
});

if (column.modules.resize && column.modules.resize.handleEl) {
if (frozenOffset) {
column.modules.resize.handleEl.style.left = frozenOffset;
}

column.element.after(column.modules.resize.handleEl);
}
}
Expand Down Expand Up @@ -24108,6 +24147,12 @@
self.table.externalEvents.dispatch("columnResized", nearestColumn.getComponent());
}
});

if (column.modules.frozen) {
handle.style.position = "absolute";
handle.style.left = column.modules.frozen.marginValue + column.getWidth() + "px";
}

config.handleEl = handle;

if (element.parentNode) {
Expand All @@ -24120,11 +24165,11 @@
}, {
key: "deInitializeColumn",
value: function deInitializeColumn(column) {
var _this2 = this;
var _this3 = this;

this.deInitializeComponent(column);
column.cells.forEach(function (cell) {
_this2.deInitializeComponent(cell);
_this3.deInitializeComponent(cell);
});
}
}, {
Expand Down Expand Up @@ -25846,7 +25891,7 @@
key: "refreshSort",
value: function refreshSort() {
if (this.table.options.sortMode === "remote") {
this.reloadData();
this.reloadData(null, false, false);
} else {
this.refreshData(true);
} //TODO - Persist left position of row manager
Expand Down
2 changes: 1 addition & 1 deletion dist/js/tabulator.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/tabulator.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/tabulator.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/tabulator_esm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Tabulator v5.2.3 (c) Oliver Folkerd 2022 */
/* Tabulator v5.2.4 (c) Oliver Folkerd 2022 */
class CoreFeature{

constructor(table){
Expand Down
4 changes: 2 additions & 2 deletions dist/js/tabulator_esm.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/tabulator_esm.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tabulator-tables",
"version": "5.2.3",
"version": "5.2.4",
"description": "Interactive table generation JavaScript library",
"style": "dist/css/tabulator.css",
"main": "dist/js/tabulator.js",
Expand Down

0 comments on commit ef7485e

Please sign in to comment.