src/extensions/sort/sort.js
-
// import 'script!sortabletable';
-import AdapterSortableTable from './adapterSortabletable';
+import AdapterSortableTable from './adapterSortabletable';
if(!window.SortableTable){
require('script!sortabletable');
diff --git a/docs/file/src/helpers.js.html b/docs/file/src/helpers.js.html
index 2efd5a53..0eef85a9 100644
--- a/docs/file/src/helpers.js.html
+++ b/docs/file/src/helpers.js.html
@@ -3,7 +3,7 @@
- src/helpers.js | tablefilter v0.2.10 API Document
+ src/helpers.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/alternateRows.js.html b/docs/file/src/modules/alternateRows.js.html
index ad888dd9..1b9418bb 100644
--- a/docs/file/src/modules/alternateRows.js.html
+++ b/docs/file/src/modules/alternateRows.js.html
@@ -3,7 +3,7 @@
- src/modules/alternateRows.js | tablefilter v0.2.10 API Document
+ src/modules/alternateRows.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/checkList.js.html b/docs/file/src/modules/checkList.js.html
index d652984f..e3957eba 100644
--- a/docs/file/src/modules/checkList.js.html
+++ b/docs/file/src/modules/checkList.js.html
@@ -3,7 +3,7 @@
- src/modules/checkList.js | tablefilter v0.2.10 API Document
+ src/modules/checkList.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/clearButton.js.html b/docs/file/src/modules/clearButton.js.html
index cdb199c0..aff484d4 100644
--- a/docs/file/src/modules/clearButton.js.html
+++ b/docs/file/src/modules/clearButton.js.html
@@ -3,7 +3,7 @@
- src/modules/clearButton.js | tablefilter v0.2.10 API Document
+ src/modules/clearButton.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/dropdown.js.html b/docs/file/src/modules/dropdown.js.html
index 6debb616..5c8d15c6 100644
--- a/docs/file/src/modules/dropdown.js.html
+++ b/docs/file/src/modules/dropdown.js.html
@@ -3,7 +3,7 @@
- src/modules/dropdown.js | tablefilter v0.2.10 API Document
+ src/modules/dropdown.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/feature.js.html b/docs/file/src/modules/feature.js.html
index 28cae42a..b8a3eaef 100644
--- a/docs/file/src/modules/feature.js.html
+++ b/docs/file/src/modules/feature.js.html
@@ -3,7 +3,7 @@
- src/modules/feature.js | tablefilter v0.2.10 API Document
+ src/modules/feature.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/gridLayout.js.html b/docs/file/src/modules/gridLayout.js.html
index 5388088f..646557cd 100644
--- a/docs/file/src/modules/gridLayout.js.html
+++ b/docs/file/src/modules/gridLayout.js.html
@@ -3,7 +3,7 @@
- src/modules/gridLayout.js | tablefilter v0.2.10 API Document
+ src/modules/gridLayout.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/hash.js.html b/docs/file/src/modules/hash.js.html
index 65a943ed..47647bb0 100644
--- a/docs/file/src/modules/hash.js.html
+++ b/docs/file/src/modules/hash.js.html
@@ -3,7 +3,7 @@
- src/modules/hash.js | tablefilter v0.2.10 API Document
+ src/modules/hash.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/help.js.html b/docs/file/src/modules/help.js.html
index 4a7921c7..9611be94 100644
--- a/docs/file/src/modules/help.js.html
+++ b/docs/file/src/modules/help.js.html
@@ -3,7 +3,7 @@
- src/modules/help.js | tablefilter v0.2.10 API Document
+ src/modules/help.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/highlightKeywords.js.html b/docs/file/src/modules/highlightKeywords.js.html
index 5c0bacf8..666d3827 100644
--- a/docs/file/src/modules/highlightKeywords.js.html
+++ b/docs/file/src/modules/highlightKeywords.js.html
@@ -3,7 +3,7 @@
- src/modules/highlightKeywords.js | tablefilter v0.2.10 API Document
+ src/modules/highlightKeywords.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/loader.js.html b/docs/file/src/modules/loader.js.html
index 61a137d8..343ec2f5 100644
--- a/docs/file/src/modules/loader.js.html
+++ b/docs/file/src/modules/loader.js.html
@@ -3,7 +3,7 @@
- src/modules/loader.js | tablefilter v0.2.10 API Document
+ src/modules/loader.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/noResults.js.html b/docs/file/src/modules/noResults.js.html
index eb6c1e3a..63342ad3 100644
--- a/docs/file/src/modules/noResults.js.html
+++ b/docs/file/src/modules/noResults.js.html
@@ -3,7 +3,7 @@
- src/modules/noResults.js | tablefilter v0.2.10 API Document
+ src/modules/noResults.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/paging.js.html b/docs/file/src/modules/paging.js.html
index 43e58bd5..470c0ed2 100644
--- a/docs/file/src/modules/paging.js.html
+++ b/docs/file/src/modules/paging.js.html
@@ -3,7 +3,7 @@
- src/modules/paging.js | tablefilter v0.2.10 API Document
+ src/modules/paging.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/popupFilter.js.html b/docs/file/src/modules/popupFilter.js.html
index 26515a23..842876b6 100644
--- a/docs/file/src/modules/popupFilter.js.html
+++ b/docs/file/src/modules/popupFilter.js.html
@@ -3,7 +3,7 @@
- src/modules/popupFilter.js | tablefilter v0.2.10 API Document
+ src/modules/popupFilter.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/rowsCounter.js.html b/docs/file/src/modules/rowsCounter.js.html
index 57ac3a3a..c186f76e 100644
--- a/docs/file/src/modules/rowsCounter.js.html
+++ b/docs/file/src/modules/rowsCounter.js.html
@@ -3,7 +3,7 @@
- src/modules/rowsCounter.js | tablefilter v0.2.10 API Document
+ src/modules/rowsCounter.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/state.js.html b/docs/file/src/modules/state.js.html
index 0ce6a8e6..2ac63a5d 100644
--- a/docs/file/src/modules/state.js.html
+++ b/docs/file/src/modules/state.js.html
@@ -3,7 +3,7 @@
- src/modules/state.js | tablefilter v0.2.10 API Document
+ src/modules/state.js | tablefilter v0.2.11 API Document
@@ -99,12 +99,15 @@ export class State extends Feature {
this.persistFilters = cfg.filters === false ? false : true;
this.persistPageNumber = Boolean(cfg.page_number);
this.persistPageLength = Boolean(cfg.page_length);
+ this.persistSort = Boolean(cfg.sort);
this.cookieDuration = !isNaN(cfg.cookie_duration) ?
parseInt(cfg.cookie_duration, 10) : 87600;
+ this.enableStorage = this.enableLocalStorage || this.enableCookie;
this.hash = null;
this.pageNb = null;
this.pageLength = null;
+ this.sort = null;
this.state = {};
this.prfxCol = 'col_';
@@ -124,13 +127,16 @@ export class State extends Feature {
this.emitter.on(['after-page-change', 'after-clearing-filters'],
(tf, pageNb) => this.updatePage(pageNb));
this.emitter.on(['after-page-length-change'],
- (tf, index) => this.updatePageLength(index));
+ (tf, pageLength) => this.updatePageLength(pageLength));
+ this.emitter.on(['column-sorted'],
+ (tf, index, descending) => this.updateSort(index, descending));
+ this.emitter.on(['sort-initialized'], () => this._syncSort());
if (this.enableHash) {
this.hash = new Hash(this);
this.hash.init();
}
- if (this.enableLocalStorage || this.enableCookie) {
+ if (this.enableStorage) {
this.storage = new Storage(this);
this.storage.init();
}
@@ -145,6 +151,7 @@ export class State extends Feature {
if (!this.isEnabled()) {
return;
}
+ let state = this.state;
let tf = this.tf;
if (this.persistFilters) {
@@ -154,34 +161,48 @@ export class State extends Feature {
let key = `${this.prfxCol}${idx}`;
if (Types.isString(val) && Str.isEmpty(val)) {
- if (this.state.hasOwnProperty(key)) {
- this.state[key] = undefined;
+ if (state.hasOwnProperty(key)) {
+ state[key] = undefined;
}
} else {
- this.state[key] = this.state[key] || {};
- this.state[key].flt = val;
+ state[key] = state[key] || {};
+ state[key].flt = val;
}
-
});
}
if (this.persistPageNumber) {
if (Types.isNull(this.pageNb)) {
- this.state[this.pageNbKey] = undefined;
+ state[this.pageNbKey] = undefined;
} else {
- this.state[this.pageNbKey] = this.pageNb;
+ state[this.pageNbKey] = this.pageNb;
}
}
if (this.persistPageLength) {
if (Types.isNull(this.pageLength)) {
- this.state[this.pageLengthKey] = undefined;
+ state[this.pageLengthKey] = undefined;
} else {
- this.state[this.pageLengthKey] = this.pageLength;
+ state[this.pageLengthKey] = this.pageLength;
}
}
- this.emitter.emit('state-changed', tf, this.state);
+ if (this.persistSort) {
+ if (!Types.isNull(this.sort)) {
+ // Remove previuosly sorted column
+ Object.keys(state).forEach((key) => {
+ if (key.indexOf(this.prfxCol) !== -1 && state[key]) {
+ state[key].sort = undefined;
+ }
+ });
+
+ let key = `${this.prfxCol}${this.sort.column}`;
+ state[key] = state[key] || {};
+ state[key].sort = { descending: this.sort.descending };
+ }
+ }
+
+ this.emitter.emit('state-changed', tf, state);
}
/**
@@ -204,6 +225,20 @@ export class State extends Feature {
this.update();
}
+ /**
+ * Refresh column sorting information on sort change
+ *
+ * @param index {Number} Column index
+ * @param descending {Boolean} Descending manner
+ */
+ updateSort(index, descending) {
+ this.sort = {
+ column: index,
+ descending: descending
+ };
+ this.update();
+ }
+
/**
* Override state field
*
@@ -214,33 +249,25 @@ export class State extends Feature {
}
/**
- * Apply current features state
+ * Sync stored features state
*/
sync() {
let state = this.state;
let tf = this.tf;
- if (this.persistFilters) {
- Object.keys(state).forEach((key) => {
- if (key.indexOf(this.prfxCol) !== -1) {
- let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
- let val = state[key].flt;
- tf.setFilterValue(colIdx, val);
- }
- });
-
- tf.filter();
- }
+ this._syncFilters();
if (this.persistPageNumber) {
let pageNumber = state[this.pageNbKey];
- this.emitter.emit('change-page', this.tf, pageNumber);
+ this.emitter.emit('change-page', tf, pageNumber);
}
if (this.persistPageLength) {
let pageLength = state[this.pageLengthKey];
- this.emitter.emit('change-page-results', this.tf, pageLength);
+ this.emitter.emit('change-page-results', tf, pageLength);
}
+
+ this._syncSort();
}
/**
@@ -260,6 +287,52 @@ export class State extends Feature {
this.enable();
}
+ /**
+ * Sync filters with stored values and filter table
+ *
+ * @private
+ */
+ _syncFilters() {
+ if (!this.persistFilters) {
+ return;
+ }
+ let state = this.state;
+ let tf = this.tf;
+
+ Object.keys(state).forEach((key) => {
+ if (key.indexOf(this.prfxCol) !== -1) {
+ let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
+ let val = state[key].flt;
+ tf.setFilterValue(colIdx, val);
+ }
+ });
+
+ tf.filter();
+ }
+
+ /**
+ * Sync sorted column with stored sorting information and sort table
+ *
+ * @private
+ */
+ _syncSort() {
+ if (!this.persistSort) {
+ return;
+ }
+ let state = this.state;
+ let tf = this.tf;
+
+ Object.keys(state).forEach((key) => {
+ if (key.indexOf(this.prfxCol) !== -1) {
+ let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
+ if (!Types.isUndef(state[key].sort)) {
+ let sort = state[key].sort;
+ this.emitter.emit('sort', tf, colIdx, sort.descending);
+ }
+ }
+ });
+ }
+
/**
* Destroy State instance
*/
@@ -275,13 +348,16 @@ export class State extends Feature {
(tf, pageNb) => this.updatePage(pageNb));
this.emitter.off(['after-page-length-change'],
(tf, index) => this.updatePageLength(index));
+ this.emitter.off(['column-sorted'],
+ (tf, index, descending) => this.updateSort(index, descending));
+ this.emitter.off(['sort-initialized'], () => this._syncSort());
if (this.enableHash) {
this.hash.destroy();
this.hash = null;
}
- if (this.enableLocalStorage || this.enableCookie) {
+ if (this.enableStorage) {
this.storage.destroy();
this.storage = null;
}
diff --git a/docs/file/src/modules/statusBar.js.html b/docs/file/src/modules/statusBar.js.html
index 44584592..786e0226 100644
--- a/docs/file/src/modules/statusBar.js.html
+++ b/docs/file/src/modules/statusBar.js.html
@@ -3,7 +3,7 @@
- src/modules/statusBar.js | tablefilter v0.2.10 API Document
+ src/modules/statusBar.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/storage.js.html b/docs/file/src/modules/storage.js.html
index bcbf7792..ea4f375f 100644
--- a/docs/file/src/modules/storage.js.html
+++ b/docs/file/src/modules/storage.js.html
@@ -3,7 +3,7 @@
- src/modules/storage.js | tablefilter v0.2.10 API Document
+ src/modules/storage.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/modules/store.js.html b/docs/file/src/modules/store.js.html
index e935c474..569246a6 100644
--- a/docs/file/src/modules/store.js.html
+++ b/docs/file/src/modules/store.js.html
@@ -3,7 +3,7 @@
- src/modules/store.js | tablefilter v0.2.10 API Document
+ src/modules/store.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/sort.js.html b/docs/file/src/sort.js.html
index 073cdd3b..3df61e82 100644
--- a/docs/file/src/sort.js.html
+++ b/docs/file/src/sort.js.html
@@ -3,7 +3,7 @@
- src/sort.js | tablefilter v0.2.10 API Document
+ src/sort.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/string.js.html b/docs/file/src/string.js.html
index 9f4c0395..ce6ada97 100644
--- a/docs/file/src/string.js.html
+++ b/docs/file/src/string.js.html
@@ -3,7 +3,7 @@
- src/string.js | tablefilter v0.2.10 API Document
+ src/string.js | tablefilter v0.2.11 API Document
diff --git a/docs/file/src/tablefilter.js.html b/docs/file/src/tablefilter.js.html
index 04d2b7de..f91006f5 100644
--- a/docs/file/src/tablefilter.js.html
+++ b/docs/file/src/tablefilter.js.html
@@ -3,7 +3,7 @@
- src/tablefilter.js | tablefilter v0.2.10 API Document
+ src/tablefilter.js | tablefilter v0.2.11 API Document
@@ -845,7 +845,7 @@ export class TableFilter {
//filter is appended in custom element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(btn);
- } else{
+ } else {
container.appendChild(btn);
}
@@ -1474,8 +1474,8 @@ export class TableFilter {
// already filtered rows display re-init
row[k].style.display = '';
- let cell = row[k].cells,
- nchilds = cell.length;
+ let cells = row[k].cells,
+ nchilds = cells.length;
// checks if row has exact cell #
if(nchilds !== this.nbCells){
@@ -1498,7 +1498,7 @@ export class TableFilter {
continue;
}
- let cellData = Str.matchCase(this.getCellData(cell[j]),
+ let cellData = Str.matchCase(this.getCellData(cells[j]),
this.caseSensitive);
//multiple search parameter operator ||
@@ -1524,7 +1524,7 @@ export class TableFilter {
for(let w=0, len=s.length; w<len; w++){
cS = Str.trim(s[w]);
occur = hasArg.call(this, cS, cellData, j);
- highlight.call(this, cS, occur, cell[j]);
+ highlight.call(this, cS, occur, cells[j]);
if((hasMultiOrSA && occur) ||
(hasMultiAndSA && !occur)){
break;
@@ -1539,7 +1539,7 @@ export class TableFilter {
//single search parameter
else {
occurence[j] = hasArg.call(this, Str.trim(sA), cellData, j);
- highlight.call(this, sA, occurence[j], cell[j]);
+ highlight.call(this, sA, occurence[j], cells[j]);
}//else single param
if(!occurence[j]){
@@ -1549,7 +1549,7 @@ export class TableFilter {
singleFltRowValid = true;
}
- this.emitter.emit('cell-processed', this, j, cell[j]);
+ this.emitter.emit('cell-processed', this, j, cells[j]);
}//for j
if(this.singleSearchFlt && singleFltRowValid){
diff --git a/docs/file/src/types.js.html b/docs/file/src/types.js.html
index cc2e5af0..7b163d2b 100644
--- a/docs/file/src/types.js.html
+++ b/docs/file/src/types.js.html
@@ -3,7 +3,7 @@
- src/types.js | tablefilter v0.2.10 API Document
+ src/types.js | tablefilter v0.2.11 API Document
diff --git a/docs/identifiers.html b/docs/identifiers.html
index 175bd3b0..ed127ade 100644
--- a/docs/identifiers.html
+++ b/docs/identifiers.html
@@ -3,7 +3,7 @@
- Index | tablefilter v0.2.10 API Document
+ Index | tablefilter v0.2.11 API Document
diff --git a/docs/index.html b/docs/index.html
index 5ffb929b..1aea3560 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@
- tablefilter v0.2.10 API Document
+ tablefilter v0.2.11 API Document
@@ -79,14 +79,13 @@ users to filter and limit the data displayed within a long table. By default, th
Extended keyboard navigation (ezEditTable extension)
Inline cell or row editing (ezEditTable extension)
Row insertion or deleting (ezEditTable extension)
-And even more behaviors...
+And even more features...
Attach to an existing HTML table
Integration with any server-side technology as this is a pure client-side
solution
-Callbacks for all events, and delegates for most actions
-Exhaustive documentation and API
+Exhaustive documentation and poweful API
Getting started
diff --git a/docs/package.json b/docs/package.json
index 446094f4..adb6b8e2 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
{
"name": "tablefilter",
- "version": "0.2.10",
+ "version": "0.2.11",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {
diff --git a/docs/script/search_index.js b/docs/script/search_index.js
index ffb640c4..91e95921 100644
--- a/docs/script/search_index.js
+++ b/docs/script/search_index.js
@@ -3257,6 +3257,12 @@ window.esdocSearchIndex = [
"src/modules/state.js~State#enableLocalStorage",
"member"
],
+ [
+ "src/modules/state.js~state#enablestorage",
+ "class/src/modules/state.js~State.html#instance-member-enableStorage",
+ "src/modules/state.js~State#enableStorage",
+ "member"
+ ],
[
"src/modules/state.js~state#hash",
"class/src/modules/state.js~State.html#instance-member-hash",
@@ -3329,12 +3335,24 @@ window.esdocSearchIndex = [
"src/modules/state.js~State#persistPageNumber",
"member"
],
+ [
+ "src/modules/state.js~state#persistsort",
+ "class/src/modules/state.js~State.html#instance-member-persistSort",
+ "src/modules/state.js~State#persistSort",
+ "member"
+ ],
[
"src/modules/state.js~state#prfxcol",
"class/src/modules/state.js~State.html#instance-member-prfxCol",
"src/modules/state.js~State#prfxCol",
"member"
],
+ [
+ "src/modules/state.js~state#sort",
+ "class/src/modules/state.js~State.html#instance-member-sort",
+ "src/modules/state.js~State#sort",
+ "member"
+ ],
[
"src/modules/state.js~state#state",
"class/src/modules/state.js~State.html#instance-member-state",
@@ -3371,6 +3389,12 @@ window.esdocSearchIndex = [
"src/modules/state.js~State#updatePageLength",
"method"
],
+ [
+ "src/modules/state.js~state#updatesort",
+ "class/src/modules/state.js~State.html#instance-method-updateSort",
+ "src/modules/state.js~State#updateSort",
+ "method"
+ ],
[
"src/modules/statusbar.js",
"file/src/modules/statusBar.js.html",
diff --git a/docs/source.html b/docs/source.html
index a64e21c3..c82bc733 100644
--- a/docs/source.html
+++ b/docs/source.html
@@ -3,7 +3,7 @@
- Source | tablefilter v0.2.10 API Document
+ Source | tablefilter v0.2.11 API Document
@@ -63,7 +63,7 @@
