1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-06-04 23:12:22 +02:00

Merged master in and fixed conflicts

This commit is contained in:
Max Guglielmi 2016-05-04 19:34:09 +10:00
commit 6afef2915b
21 changed files with 679 additions and 1096 deletions

View file

@ -3,8 +3,8 @@
"rules": {
"max-len": [2, 80, 2, {"ignoreUrls": true}],
"max-depth": [2, 7],
"max-statements": [2, 172],
"complexity": [2, 88],
"max-statements": [2, 166],
"complexity": [2, 86],
"no-unused-vars": 2,
"no-eval": 2,
"no-underscore-dangle": 0,
@ -27,5 +27,8 @@
"es6": true,
"browser": true,
"node": false
},
"globals": {
"__webpack_public_path__": false
}
}

View file

@ -122,12 +122,14 @@ Find exhaustive documentation on the configuration options in the [WIKI](https:/
Autogenerated documentation of the ES6 modules is available on the website: [docs](http://koalyptus.github.io/TableFilter/docs)
If you previously used the HTML Table Filter Generator plugin, verify the configuration
options you are using are still supported: [Obsolete](https://github.com/koalyptus/TableFilter/wiki/--Obsolete)
Run this task to generate the documentation in the ``docs/docs`` directory:
```shell
grunt esdoc
```
## Support
* GitHub for reporting bugs and feature requests.

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.2.13 - Starter</title>
<title>tablefilter v0.2.17 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.13</h1>
<h1>tablefilter v0.2.17</h1>

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
table.TF{border-left:1px solid #ccc;border-top:none;border-right:none;border-bottom:none;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;border-left:1px solid #fff;border-top:1px solid #fff;color:#333}table.TF td{border-bottom:1px dotted #999;padding:5px}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#999 !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
table.TF{border-left:1px dotted #81963b;border-top:none;border-right:0;border-bottom:none;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x;border-bottom:0;border-right:1px dotted #d0d0d0;border-left:0;border-top:0;color:#fff}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#81963b !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T17:01:50.967Z
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* MIT License
*/
table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.2.13",
"version": "0.2.17",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {
@ -32,12 +32,12 @@
"babel-eslint": "6.0.4",
"babel-loader": "^6.0.1",
"babel-preset-es2015": "^6.5.0",
"babel-plugin-transform-es2015-classes": "^6.6.5",
"clean-webpack-plugin": "^0.1.3",
"babel-plugin-transform-es2015-classes": "^6.7.7",
"clean-webpack-plugin": "^0.1.9",
"grunt": "^1.0.1",
"grunt-babel": "^6.0.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-connect": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-qunit": "^1.1.0",
"grunt-contrib-stylus": "^1.2.0",

View file

@ -182,7 +182,7 @@ export default class ColsVisibility {
this.buildManager();
this.initialized = true;
this.emitter.emit('columns-visibility-initialized', tf, this);
this.emitter.emit('columns-visibility-initialized', this.tf, this);
// Hide columns at start at very end of initialization
this._hideAtStart();

View file

@ -91,7 +91,7 @@ export default class FiltersVisibility {
this.buildUI();
this.initialized = true;
this.emitter.on(['show-filters'], (tf, visible) => this.show(visible));
this.emitter.emit('filters-visibility-initialized', tf, this);
this.emitter.emit('filters-visibility-initialized', this.tf, this);
}
/**
@ -147,7 +147,6 @@ export default class FiltersVisibility {
let isDisplayed = fltRow.style.display === '';
this.show(!isDisplayed);
this.emitter.emit('filters-toggled', tf, this, !isDisplayed);
}
/**
@ -179,6 +178,8 @@ export default class FiltersVisibility {
if (this.onAfterHide && !visible) {
this.onAfterHide.call(null, this);
}
this.emitter.emit('filters-toggled', tf, this, visible);
}
/**

View file

@ -326,16 +326,14 @@ export class Paging extends Feature{
targetEl.appendChild(btnLastSpan);
this.pagingSlc = Dom.id(this.prfxSlcPages + tf.id);
if(!tf.rememberGridValues){
this.setPagingInfo();
}
if (!tf.fltGrid) {
tf.validateAllRows();
this.setPagingInfo(tf.validRowsIndex);
}
this.emitter.on(['after-filtering'], () => this.resetPagingInfo());
this.emitter.on(['initialized'], ()=> this.resetValues());
this.emitter.on(['change-page'],
(tf, pageNumber) => this.setPage(pageNumber));
this.emitter.on(['change-page-results'],
@ -396,7 +394,8 @@ export class Paging extends Feature{
mdiv.style.visibility = 'visible';
if (this.pageSelectorType === tf.fltTypeSlc) {
for (var z = 0; z < this.nbPages; z++) {
var opt = Dom.createOpt(z+1, z*this.pagingLength, false);
var opt = Dom.createOpt(z + 1, z * this.pagingLength,
false);
this.pagingSlc.options[z] = opt;
}
} else {
@ -434,7 +433,8 @@ export class Paging extends Feature{
var rowDisplayed = false;
if (h >= startPagingRow && h < endPagingRow) {
if(Types.isNull(isRowValid) || Boolean(isRowValid==='true')){
if (Types.isNull(isRowValid) ||
Boolean(isRowValid === 'true')) {
r.style.display = '';
rowDisplayed = true;
}
@ -459,7 +459,7 @@ export class Paging extends Feature{
}
/**
* Show page based on passed param value (string or number):
* Show page defined by passed argument (string or number):
* @param {String}/{Number} cmd possible string values: 'next',
* 'previous', 'last', 'first' or page number as per param
*/
@ -578,7 +578,7 @@ export class Paging extends Feature{
if (index === null) {
index = this.pageSelectorType === tf.fltTypeSlc ?
this.pagingSlc.options.selectedIndex : (this.pagingSlc.value-1);
this.pagingSlc.options.selectedIndex : this.pagingSlc.value - 1;
}
if (index >= 0 && index <= (this.nbPages - 1)) {
if (this.onBeforeChangePage) {
@ -650,19 +650,6 @@ export class Paging extends Feature{
this.emitter.emit('after-page-length-change', tf, this.pagingLength);
}
/**
* Re-set persisted pagination info
*/
resetValues(){
var tf = this.tf;
if(tf.rememberPageLen){
this.resetPageLength();
}
if(tf.rememberPageNb){
this.resetPage();
}
}
/**
* Re-set page nb at page re-load
*/
@ -767,7 +754,6 @@ export class Paging extends Feature{
}
this.emitter.off(['after-filtering'], () => this.resetPagingInfo());
this.emitter.off(['initialized'], ()=> this.resetValues());
this.emitter.off(['change-page'],
(tf, pageNumber) => this.setPage(pageNumber));
this.emitter.off(['change-page-results'],

View file

@ -367,6 +367,7 @@ export class State extends Feature {
let tf = this.tf;
let filtersVisibility = state[this.filtersVisKey];
this.filtersVisibility = filtersVisibility;
this.emitter.emit('show-filters', tf, filtersVisibility);
}

View file

@ -1,146 +0,0 @@
import Cookie from '../cookie';
import Types from '../types';
export class Store{
/**
* Store, persistence manager
* @param {Object} tf TableFilter instance
*
* TODO: use localStorage and fallback to cookie persistence
*/
constructor(tf){
let f = tf.config();
//cookie storing filter values
this.fltsValuesCookie = tf.prfxCookieFltsValues + tf.id;
//cookie storing page nb
this.pgNbCookie = tf.prfxCookiePageNb + tf.id;
//cookie storing page length
this.pgLenCookie = tf.prfxCookiePageLen + tf.id;
this.duration = !isNaN(f.set_cookie_duration) ?
parseInt(f.set_cookie_duration, 10) : 100000;
this.tf = tf;
this.emitter = tf.emitter;
}
init(){
this.emitter.on(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.on(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.on(['after-page-change'],
(tf, index)=> this.savePageNb(index));
this.emitter.on(['after-page-length-change'],
(tf, index)=> this.savePageLength(index));
}
/**
* Store filters' values in cookie
*/
saveFilterValues(){
let tf = this.tf;
let fltValues = [];
if(!tf.rememberGridValues){
return;
}
//store filters' values
for(let i=0; i<tf.fltIds.length; i++){
let value = tf.getFilterValue(i);
//convert array to a || separated values
if(Types.isArray(value)){
let rgx = new RegExp(tf.separator, 'g');
value = value.toString()
.replace(rgx, ' ' + tf.orOperator + ' ');
}
if (value === ''){
value = ' ';
}
fltValues.push(value);
}
//write cookie
Cookie.write(
this.fltsValuesCookie,
fltValues.join(tf.separator),
this.duration
);
}
/**
* Retrieve filters' values from cookie
* @return {Array}
*/
getFilterValues(){
let flts = Cookie.read(this.fltsValuesCookie);
let rgx = new RegExp(this.tf.separator, 'g');
// filters' values array
return flts.split(rgx);
}
/**
* Store page number in cookie
* @param {Number} pageIndex page index to persist
*/
savePageNb(pageIndex){
if(!this.tf.rememberPageNb){
return;
}
Cookie.write(
this.pgNbCookie,
pageIndex,
this.duration
);
}
/**
* Retrieve page number from cookie
* @return {String}
*/
getPageNb(){
return Cookie.read(this.pgNbCookie);
}
/**
* Store page length in cookie
* @param {Number} index page length index to persist
*/
savePageLength(index){
if(!this.tf.rememberPageLen){
return;
}
Cookie.write(
this.pgLenCookie,
index,
this.duration
);
}
/**
* Retrieve page length from cookie
* @return {String}
*/
getPageLength(){
return Cookie.read(this.pgLenCookie);
}
/**
* Remove all cookies
*/
clearCookies(){
Cookie.remove(this.fltsValuesCookie);
Cookie.remove(this.pgLenCookie);
Cookie.remove(this.pgNbCookie);
}
destroy(){
this.emitter.off(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.off(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.off(['after-page-change'],
(tf, index)=> this.savePageNb(index));
this.emitter.off(['after-page-length-change'],
(tf, index)=> this.savePageLength(index));
}
}

View file

@ -4,10 +4,8 @@ import Str from './string';
import Types from './types';
import DateHelper from './date';
import Helpers from './helpers';
import {Emitter} from './emitter';
// Features
import {Store} from './modules/store';
import {Emitter} from './emitter';
import {GridLayout} from './modules/gridLayout';
import {Loader} from './modules/loader';
import {HighlightKeyword} from './modules/highlightKeywords';
@ -70,7 +68,8 @@ export class TableFilter {
// }
});
if(!this.tbl || this.tbl.nodeName != 'TABLE' || this.getRowsNb() === 0){
if (!this.tbl || this.tbl.nodeName != 'TABLE' ||
this.getRowsNb() === 0) {
throw new Error(
'Could not instantiate TableFilter: HTML table not found.');
}
@ -197,7 +196,8 @@ export class TableFilter {
//stores filters elements if isExternalFlt is true
this.externalFltEls = [];
//delays any filtering process if loader true
this.execDelay = !isNaN(f.exec_delay) ? parseInt(f.exec_delay,10) : 100;
this.execDelay = !isNaN(f.exec_delay) ? parseInt(f.exec_delay, 10) :
100;
//calls function when filters grid loaded
this.onFiltersLoaded = Types.isFn(f.on_filters_loaded) ?
f.on_filters_loaded : null;
@ -316,8 +316,7 @@ export class TableFilter {
this.nbHiddenRows = 0; //nb hidden rows
/*** autofilter on typing ***/
//enables/disables auto filtering, table is filtered when user stops
//typing
//Auto filtering, table is filtered when user stops typing
this.autoFilter = Boolean(f.auto_filter);
//onkeyup delay timer (msecs)
this.autoFilterDelay = !isNaN(f.auto_filter_delay) ?
@ -378,16 +377,6 @@ export class TableFilter {
this.prfxCookiePageLen = 'tf_pglen_';
this.prfxResponsive = 'resp';
/*** cookies ***/
//remembers filters values on page load
this.rememberGridValues = Boolean(f.remember_grid_values);
//remembers page nb on page load
this.rememberPageNb = this.paging && f.remember_page_number;
//remembers page length on page load
this.rememberPageLen = this.paging && f.remember_page_length;
this.hasPersistence = this.rememberGridValues || this.rememberPageNb ||
this.rememberPageLen;
/*** extensions ***/
//imports external script
this.extensions = f.extensions;
@ -409,71 +398,6 @@ export class TableFilter {
// Extensions registry
this.ExtRegistry = {};
/*** TF events ***/
this.Evt = {
// Detect <enter> key
detectKey(e) {
if(!this.enterKey){ return; }
if(e){
let key = Event.keyCode(e);
if(key===13){
this.filter();
Event.cancel(e);
Event.stop(e);
} else {
this.isUserTyping = true;
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
}
}
},
// if auto-filter on, detect user is typing and filter columns
onKeyUp(e) {
if(!this.autoFilter){
return;
}
let key = Event.keyCode(e);
this.isUserTyping = false;
function filter() {
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
if(!this.isUserTyping){
this.filter();
this.isUserTyping = null;
}
}
if(key!==13 && key!==9 && key!==27 && key!==38 && key!==40) {
if(this.autoFilterTimer === null){
this.autoFilterTimer = global.setInterval(
filter.bind(this), this.autoFilterDelay);
}
} else {
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
}
},
// if auto-filter on, detect user is typing
onKeyDown() {
if(!this.autoFilter) { return; }
this.isUserTyping = true;
},
// if auto-filter on, clear interval on filter blur
onInpBlur() {
if(this.autoFilter){
this.isUserTyping = false;
global.clearInterval(this.autoFilterTimer);
}
this.emitter.emit('filter-blur', this);
},
// set focused text-box filter as active
onInpFocus(e) {
let elm = Event.target(e);
this.emitter.emit('filter-focus', this, elm);
}
};
}
/**
@ -485,8 +409,8 @@ export class TableFilter {
}
let Mod = this.Mod;
let n = this.singleSearchFlt ? 1 : this.nbCells,
inpclass;
let n = this.singleSearchFlt ? 1 : this.nbCells;
let inpclass;
//loads stylesheet if not imported
this.import(this.stylesheetId, this.stylesheet, null, 'link');
@ -511,13 +435,6 @@ export class TableFilter {
Mod.state.init();
}
if(this.hasPersistence){
if(!Mod.store){
Mod.store = new Store(this);
}
Mod.store.init();
}
if (this.gridLayout) {
if (!Mod.gridLayout) {
Mod.gridLayout = new GridLayout(this);
@ -608,7 +525,8 @@ export class TableFilter {
/* Features */
if (this.hasVisibleRows) {
this.emitter.on(['after-filtering'], ()=> this.enforceVisibility());
this.emitter.on(['after-filtering'],
() => this.enforceVisibility());
this.enforceVisibility();
}
if (this.rowsCounter) {
@ -648,10 +566,6 @@ export class TableFilter {
this._hasGrid = true;
if(this.hasPersistence){
this.resetFilterValues();
}
//TF css class is added to table
if (!this.gridLayout) {
Dom.addClass(this.tbl, this.prfxTf);
@ -684,6 +598,89 @@ export class TableFilter {
this.emitter.emit('initialized', this);
}
/**
* Detect <enter> key
* @param {Event} evt
*/
detectKey(evt) {
if (!this.enterKey) {
return;
}
if (evt) {
let key = Event.keyCode(evt);
if (key === 13) {
this.filter();
Event.cancel(evt);
Event.stop(evt);
} else {
this.isUserTyping = true;
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
}
}
}
/**
* Filter's keyup event: if auto-filter on, detect user is typing and filter
* columns
* @param {Event} evt
*/
onKeyUp(evt) {
if (!this.autoFilter) {
return;
}
let key = Event.keyCode(evt);
this.isUserTyping = false;
function filter() {
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
if (!this.isUserTyping) {
this.filter();
this.isUserTyping = null;
}
}
// TODO: define constants for keys
if (key !== 13 && key !== 9 && key !== 27 && key !== 38 && key !== 40) {
if (this.autoFilterTimer === null) {
this.autoFilterTimer = global.setInterval(filter.bind(this),
this.autoFilterDelay);
}
} else {
global.clearInterval(this.autoFilterTimer);
this.autoFilterTimer = null;
}
}
/**
* Filter's keydown event: if auto-filter on, detect user is typing
*/
onKeyDown() {
if (this.autoFilter) {
this.isUserTyping = true;
}
}
/**
* Filter's focus event
* @param {Event} evt
*/
onInpFocus(evt) {
let elm = Event.target(evt);
this.emitter.emit('filter-focus', this, elm);
}
/**
* Filter's blur event: if auto-filter on, clear interval on filter blur
*/
onInpBlur() {
if (this.autoFilter) {
this.isUserTyping = false;
global.clearInterval(this.autoFilterTimer);
}
this.emitter.emit('filter-blur', this);
}
/**
* Insert filters row at initialization
*/
@ -745,7 +742,7 @@ export class TableFilter {
);
}
inp.className = cssClass || this.fltCssClass;
Event.add(inp, 'focus', this.Evt.onInpFocus.bind(this));
Event.add(inp, 'focus', (evt) => this.onInpFocus(evt));
//filter is appended in custom element
if (externalFltTgtId) {
@ -757,10 +754,10 @@ export class TableFilter {
this.fltIds.push(inp.id);
Event.add(inp, 'keypress', this.Evt.detectKey.bind(this));
Event.add(inp, 'keydown', this.Evt.onKeyDown.bind(this));
Event.add(inp, 'keyup', this.Evt.onKeyUp.bind(this));
Event.add(inp, 'blur', this.Evt.onInpBlur.bind(this));
Event.add(inp, 'keypress', (evt) => this.detectKey(evt));
Event.add(inp, 'keydown', () => this.onKeyDown());
Event.add(inp, 'keyup', (evt) => this.onKeyUp(evt));
Event.add(inp, 'blur', () => this.onInpBlur());
}
/**
@ -1143,23 +1140,6 @@ export class TableFilter {
return [optArray, optTxt];
}
/**
* Reset persisted filter values
*/
resetFilterValues(){
if(!this.rememberGridValues){
return;
}
let storeValues = this.Mod.store.getFilterValues();
storeValues.forEach((val, idx)=> {
if(val !== ' '){
this.setFilterValue(idx, val);
}
});
this.filter();
}
/**
* Filter the table by retrieving the data from each cell in every single
* row and comparing it to the search term for current column. A row is
@ -1375,8 +1355,8 @@ export class TableFilter {
occurence =
cellData.lastIndexOf(searchArg, cellData.length - 1) ===
(cellData.length - 1) - (searchArg.length - 1) &&
cellData.lastIndexOf(
searchArg, cellData.length-1) > -1 ? true : false;
cellData.lastIndexOf(searchArg, cellData.length - 1)
> -1 ? true : false;
}
//empty
else if (hasEM) {
@ -2121,7 +2101,7 @@ export class TableFilter {
this.setFilterValue(slcIndex[i], slcSelectedValue);
}
}// for i
}
}
/**
@ -2177,14 +2157,13 @@ export class TableFilter {
head = Dom.tag(doc, 'head')[0];
if (Str.lower(ftype) === 'link') {
file = Dom.create(
'link',
file = Dom.create('link',
['id', fileId], ['type', 'text/css'],
['rel', 'stylesheet'], ['href', filePath]
);
} else {
file = Dom.create(
'script', ['id', fileId],
file = Dom.create('script',
['id', fileId],
['type', 'text/javascript'], ['src', filePath]
);
}
@ -2201,7 +2180,7 @@ export class TableFilter {
}
};
file.onerror = function () {
throw new Error('TF script could not load: ' + filePath);
throw new Error('TableFilter could not load: ' + filePath);
};
head.appendChild(file);
}

View file

@ -2,9 +2,6 @@ var tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
paging: true,
paging_length: 2,
remember_grid_values: true,
remember_page_number: true,
remember_page_length: true,
results_per_page: ['Results per page ', [2,4,6]],
extensions: [{
name: 'sort',
@ -29,7 +26,7 @@ test('Sort extension', function() {
deepEqual(sort.initialized, true, 'Sort initialized');
});
module('Paging with persistence when a column is sorted');
module('Paging when a column is sorted');
test('It contains options', function() {
var sort = tf.extension('sort');
sort.sortByColumnIndex(0);
@ -45,7 +42,7 @@ test('Can select a page', function() {
});
module('Changing pages when column is sorted (issue #70)');
test('It can change page', function() {
test('Can change page', function() {
var sort = tf.extension('sort');
tf.setFilterValue(2, '>400');
sort.sortByColumnIndex(1);

View file

@ -1,78 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>TableFilter store</title>
<link rel="stylesheet" href="libs/qunit/qunit.css">
<script src="libs/qunit/qunit.js"></script>
<script src="libs/polyfill.js"></script>
</head>
<body>
<table id="store" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<th>From</th>
<th>Destination</th>
<th>Road Distance (km)</th>
<th>By Air (hrs)</th>
<th>By Rail (hrs)</th>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Adelaide</td>
<td>1412</td>
<td>1.4</td>
<td>25.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Brisbane</td>
<td>982</td>
<td>1.5</td>
<td>16</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Canberra</td>
<td>286</td>
<td>.6</td>
<td>4.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Melbourne</td>
<td>872</td>
<td>1.1</td>
<td>10.5</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Perth</td>
<td>2781</td>
<td>3.1</td>
<td>38</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Alice Springs</td>
<td>1533</td>
<td>2</td>
<td>20.25</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Brisbane</td>
<td>2045</td>
<td>2.15</td>
<td>40</td>
</tr>
</tbody>
</table>
<script src="../dist/tablefilter/tablefilter.js"></script>
<script src="test-store.js"></script>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
</body>
</html>

View file

@ -1,162 +0,0 @@
function removeCookie(name){
var expire = '';
var hours = -1;
if(hours){
expire = new Date((new Date()).getTime() + hours * 3600000);
expire = '; expires=' + expire.toGMTString();
}
document.cookie = name + '=' + expire;
}
function readCookie(name){
var cookieValue = '',
search = name + '=';
if(document.cookie.length > 0){
var cookie = document.cookie,
offset = cookie.indexOf(search);
if(offset !== -1){
offset += search.length;
var end = cookie.indexOf(';', offset);
if(end === -1){
end = cookie.length;
}
cookieValue = unescape(cookie.substring(offset, end));
}
}
return cookieValue;
}
var tf = new TableFilter('store', {
base_path: '../dist/tablefilter/',
paging: true,
paging_length: 2,
results_per_page: ['Results per page', [2, 4, 6]],
remember_grid_values: true,
remember_page_number: true,
remember_page_length: true
});
removeCookie(tf.fltsValuesCookie);
removeCookie(tf.pgNbCookie);
removeCookie(tf.pgLenCookie);
tf.init();
tf.clearFilters();
module('Sanity checks');
test('Store module', function() {
var store = tf.feature('store');
deepEqual(tf.hasPersistence, true, 'Requires persistence');
deepEqual(typeof store, 'object', 'Store type');
notEqual(store, null, 'Store instanciated');
deepEqual(store.duration, 100000, 'Store duration');
});
module('Check page number persistence');
test('Page number value', function() {
tf.clearFilters();
tf.filter();
tf.feature('paging').changePage(1);
deepEqual(tf.feature('store').getPageNb(), '2', 'Page number value');
tf.clearFilters();
});
module('Check page length persistence');
test('Page length value', function() {
var paging = tf.feature('paging');
paging.changeResultsPerPage('2');
deepEqual(tf.feature('store').getPageLength(), '2', 'Page length value');
tf.clearFilters();
});
module('Check filters persistence');
test('Filters value in cookie', function() {
tf.setFilterValue(0, 'Sydney');
tf.setFilterValue(3, '1.5');
tf.filter();
deepEqual(tf.feature('store').getFilterValues()[0],
'Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues()[3],
'1.5', 'Filter 3 value');
});
test('Filters value in cookie', function() {
tf.setFilterValue(0, 'Sydney');
tf.setFilterValue(3, '1.5');
tf.filter();
deepEqual(tf.feature('store').getFilterValues()[0], 'Sydney',
'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues()[3], '1.5',
'Filter 3 value');
});
test('Filters value with operators in cookie', function() {
tf.setFilterValue(0, '');
tf.setFilterValue(1, 'Canberra || Perth');
tf.setFilterValue(3, '>.6');
tf.filter();
deepEqual(tf.feature('store').getFilterValues()[0], ' ', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues()[1],
'Canberra || Perth', 'Filter 1 value');
deepEqual(tf.feature('store').getFilterValues()[3], '>.6',
'Filter 3 value');
deepEqual(tf.getValidRows().length, 1, 'Expected nb of filtered rows');
});
test('Apply cookie filters value', function() {
tf.setFilterValue(0, 'Adelaide');
tf.setFilterValue(3, '>=2');
tf.filter();
tf.destroy();
tf.init();
deepEqual(tf.getFilterValue(0), 'Adelaide', 'Applied filter value');
deepEqual(tf.getFilterValue(3), '>=2', 'Applied filter value');
});
test('Can remove cookies on clearFilters', function() {
tf.clearFilters();
deepEqual(readCookie(tf.fltsValuesCookie), '',
'fltsValuesCookie cookie removed');
deepEqual(readCookie(tf.pgLenCookie), '', 'pgLenCookie cookie removed');
deepEqual(readCookie(tf.pgNbCookie), '', 'pgNbCookie cookie removed');
});
module('Multiple and checklist filters persistence');
test('Filters value in cookie', function() {
tf.destroy();
tf = new TableFilter('store', {
base_path: '../dist/tablefilter/',
remember_grid_values: true,
col_0: 'multiple',
col_1: 'checklist'
});
tf.init();
tf.setFilterValue(0, ['Sydney', 'Adelaide']);
tf.setFilterValue(1, ['Alice Springs', 'Brisbane']);
tf.filter();
deepEqual(tf.feature('store').getFilterValues()[0],
'Adelaide || Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues()[1],
'Alice Springs || Brisbane', 'Filter 1 value');
deepEqual(tf.getValidRows().length, 3, 'Expected nb of filtered rows');
});
module('Tear-down');
test('TableFilter removed', function() {
tf.destroy();
removeCookie(tf.fltsValuesCookie);
removeCookie(tf.pgNbCookie);
removeCookie(tf.pgLenCookie);
deepEqual(tf.hasGrid(), false, 'Filters removed');
});