mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-21 15:56:40 +02:00
Finalised unit tests, removed applyProps method in tablefilter class
This commit is contained in:
parent
b20e9899b1
commit
da9f8ad885
2
dist/tablefilter/style/colsVisibility.css
vendored
2
dist/tablefilter/style/colsVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* 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}
|
2
dist/tablefilter/style/filtersVisibility.css
vendored
2
dist/tablefilter/style/filtersVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* 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}
|
2
dist/tablefilter/style/tablefilter.css
vendored
2
dist/tablefilter/style/tablefilter.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px solid #ccc !important;border-top:none !important;border-right:none !important;border-bottom:none !important;}table.TF th{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;color:#333 !important}table.TF td{border-bottom:1px dotted #999 !important;padding:5px !important}.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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px dotted #81963b !important;border-top:none !important;border-right:0 !important;border-bottom:none !important;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;color:#fff !important}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px !important}.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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-28T00:17:35.892Z
|
||||
* build date: 2015-12-28T06:48:43.448Z
|
||||
* 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}
|
10
dist/tablefilter/tablefilter.js
vendored
10
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
6
dist/tablefilter/tf-1.js
vendored
6
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
@ -22,6 +22,9 @@ export default class ColOps{
|
|||
}
|
||||
|
||||
init(){
|
||||
// subscribe to events
|
||||
this.tf.emitter.on('after-filtering', ()=> this.calc());
|
||||
|
||||
this.calc();
|
||||
}
|
||||
|
||||
|
@ -310,6 +313,9 @@ export default class ColOps{
|
|||
}
|
||||
}
|
||||
|
||||
destroy(){}
|
||||
destroy(){
|
||||
// unsubscribe to events
|
||||
this.tf.emitter.off('after-filtering', ()=> this.calc());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -59,10 +59,22 @@ export class NoResults extends Feature{
|
|||
}
|
||||
|
||||
this.cont = cont;
|
||||
|
||||
// subscribe to after-filtering event
|
||||
this.emitter.on('after-filtering', ()=> this.toggle());
|
||||
|
||||
this.initialized = true;
|
||||
this.hide();
|
||||
}
|
||||
|
||||
toggle(){
|
||||
if(this.tf.nbVisibleRows > 0){
|
||||
this.hide();
|
||||
} else {
|
||||
this.show();
|
||||
}
|
||||
}
|
||||
|
||||
show(){
|
||||
if(!this.initialized || !this.isEnabled()){
|
||||
return;
|
||||
|
@ -115,6 +127,8 @@ export class NoResults extends Feature{
|
|||
}
|
||||
Dom.remove(this.cont);
|
||||
this.cont = null;
|
||||
// unsubscribe to after-filtering event
|
||||
this.emitter.off('after-filtering', ()=> this.toggle());
|
||||
this.initialized = false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -334,6 +334,8 @@ export class Paging extends Feature{
|
|||
this.setPagingInfo(tf.validRowsIndex);
|
||||
}
|
||||
|
||||
this.emitter.on('after-filtering', ()=> this.resetPagingInfo());
|
||||
|
||||
this.initialized = true;
|
||||
}
|
||||
|
||||
|
@ -354,6 +356,15 @@ export class Paging extends Feature{
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset paging info from scratch after a filtering process
|
||||
*/
|
||||
resetPagingInfo(){
|
||||
this.startPagingRow = 0;
|
||||
this.currentPageNb = 1;
|
||||
this.setPagingInfo(this.tf.validRowsIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate number of pages based on valid rows
|
||||
* Refresh paging select according to number of pages
|
||||
|
@ -449,8 +460,6 @@ export class Paging extends Feature{
|
|||
}
|
||||
|
||||
tf.nbVisibleRows = tf.validRowsIndex.length;
|
||||
//re-applies filter behaviours after filtering process
|
||||
tf.applyProps();
|
||||
|
||||
// broadcast grouping by page
|
||||
this.emitter.emit('grouped-by-page', tf, this);
|
||||
|
@ -779,6 +788,8 @@ export class Paging extends Feature{
|
|||
this.removeResultsPerPage();
|
||||
}
|
||||
|
||||
this.emitter.off('after-filtering', ()=> this.resetPagingInfo());
|
||||
|
||||
this.pagingSlc = null;
|
||||
this.nbPages = 0;
|
||||
this.disable();
|
||||
|
|
|
@ -101,6 +101,10 @@ export class PopupFilter extends Feature{
|
|||
this.popUpFltImgs[i] = popUpSpan.firstChild;
|
||||
}
|
||||
|
||||
// subscribe to events
|
||||
this.emitter.on('before-filtering', ()=> this.buildIcons());
|
||||
this.emitter.on('after-filtering', ()=> this.closeAll());
|
||||
|
||||
this.initialized = true;
|
||||
}
|
||||
|
||||
|
@ -245,6 +249,11 @@ export class PopupFilter extends Feature{
|
|||
this.popUpFltElms = [];
|
||||
this.popUpFltSpans = [];
|
||||
this.popUpFltImgs = [];
|
||||
|
||||
// unsubscribe to events
|
||||
this.emitter.off('before-filtering', ()=> this.buildIcons());
|
||||
this.emitter.off('after-filtering', ()=> this.closeAll());
|
||||
|
||||
this.initialized = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -8,13 +8,19 @@ export class Store{
|
|||
*
|
||||
* TODO: use localStorage and fallback to cookie persistence
|
||||
*/
|
||||
constructor(tf) {
|
||||
constructor(tf){
|
||||
var f = tf.config();
|
||||
|
||||
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.tf.fltsValuesCookie));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -97,4 +103,8 @@ export class Store{
|
|||
return Cookie.read(name);
|
||||
}
|
||||
|
||||
destroy(){
|
||||
this.emitter.off('after-filtering',
|
||||
()=> this.saveFilterValues(this.tf.fltsValuesCookie));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -635,6 +635,7 @@ export class TableFilter {
|
|||
if(this.rememberGridValues || this.rememberPageNb ||
|
||||
this.rememberPageLen){
|
||||
Mod.store = new Store(this);
|
||||
Mod.store.init();
|
||||
}
|
||||
|
||||
if(this.gridLayout){
|
||||
|
@ -874,6 +875,7 @@ export class TableFilter {
|
|||
|
||||
/* Features */
|
||||
if(this.hasVisibleRows){
|
||||
this.emitter.on('after-filtering', ()=> this.enforceVisibility());
|
||||
this.enforceVisibility();
|
||||
}
|
||||
if(this.rowsCounter){
|
||||
|
@ -937,6 +939,11 @@ export class TableFilter {
|
|||
this.initExtensions();
|
||||
}
|
||||
|
||||
// Subscribe to event
|
||||
if(this.linkedFilters){
|
||||
this.emitter.on('after-filtering', ()=> this.linkFilters());
|
||||
}
|
||||
|
||||
if(this.onFiltersLoaded){
|
||||
this.onFiltersLoaded.call(null, this);
|
||||
}
|
||||
|
@ -1219,13 +1226,21 @@ export class TableFilter {
|
|||
}
|
||||
|
||||
// Destroy modules
|
||||
Object.keys(Mod).forEach(function(key) {
|
||||
Object.keys(Mod).forEach(function(key){
|
||||
var feature = Mod[key];
|
||||
if(feature && Types.isFn(feature.destroy)){
|
||||
feature.destroy();
|
||||
}
|
||||
});
|
||||
|
||||
// unsubscribe to events
|
||||
if(this.hasVisibleRows){
|
||||
this.emitter.off('after-filtering', ()=> this.enforceVisibility());
|
||||
}
|
||||
if(this.linkedFilters){
|
||||
this.emitter.off('after-filtering', ()=> this.linkFilters());
|
||||
}
|
||||
|
||||
Dom.removeClass(this.tbl, this.prfxTf);
|
||||
this.nbHiddenRows = 0;
|
||||
this.validRowsIndex = null;
|
||||
|
@ -1512,9 +1527,9 @@ export class TableFilter {
|
|||
Mod.highlightKeyword.unhighlightAll();
|
||||
}
|
||||
//removes popup filters active icons
|
||||
if(this.popupFilters){
|
||||
Mod.popupFilter.buildIcons();
|
||||
}
|
||||
// if(this.popupFilters){
|
||||
// Mod.popupFilter.buildIcons();
|
||||
// }
|
||||
//removes active column header class
|
||||
if(this.markActiveColumns){
|
||||
this.clearActiveColumns();
|
||||
|
@ -1862,67 +1877,14 @@ export class TableFilter {
|
|||
this.nbVisibleRows = this.validRowsIndex.length;
|
||||
this.nbHiddenRows = hiddenrows;
|
||||
|
||||
if(this.rememberGridValues){
|
||||
Mod.store.saveFilterValues(this.fltsValuesCookie);
|
||||
}
|
||||
|
||||
//applies filter props after filtering process
|
||||
// TODO remove below if statement when custom events in place
|
||||
if(!this.paging){
|
||||
this.applyProps();
|
||||
} else {
|
||||
// Shouldn't need to care of that here...
|
||||
// TODO: provide a method in paging module
|
||||
Mod.paging.startPagingRow = 0;
|
||||
Mod.paging.currentPageNb = 1;
|
||||
Mod.paging.setPagingInfo(this.validRowsIndex);
|
||||
}
|
||||
//invokes onafterfilter callback
|
||||
if(this.onAfterFilter){
|
||||
this.onAfterFilter.call(null, this);
|
||||
}
|
||||
|
||||
this.emitter.emit('after-filtering', this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-apply the features/behaviour concerned by filtering/paging operation
|
||||
*
|
||||
* NOTE: this will disappear whenever custom events in place
|
||||
*/
|
||||
applyProps(){
|
||||
let Mod = this.Mod;
|
||||
|
||||
//shows rows always visible
|
||||
if(this.hasVisibleRows){
|
||||
this.enforceVisibility();
|
||||
}
|
||||
//columns operations
|
||||
if(this.hasExtension('colOps')){
|
||||
this.extension('colOps').calc();
|
||||
}
|
||||
|
||||
//re-populates drop-down filters
|
||||
if(this.linkedFilters){
|
||||
this.linkFilters();
|
||||
}
|
||||
|
||||
// if(this.rowsCounter){
|
||||
// Mod.rowsCounter.refresh(this.nbVisibleRows);
|
||||
// }
|
||||
|
||||
if(this.popupFilters){
|
||||
Mod.popupFilter.closeAll();
|
||||
}
|
||||
|
||||
if(this.noResults){
|
||||
if(this.nbVisibleRows > 0){
|
||||
Mod.noResults.hide();
|
||||
} else {
|
||||
Mod.noResults.show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the data of a specified colum
|
||||
* @param {Number} colIndex Column index
|
||||
|
@ -2400,12 +2362,14 @@ export class TableFilter {
|
|||
for(let i=0, len=this.fltIds.length; i<len; i++){
|
||||
this.setFilterValue(i, '');
|
||||
}
|
||||
if(this.linkedFilters){
|
||||
this.linkFilters();
|
||||
}
|
||||
// if(this.linkedFilters){
|
||||
// this.linkFilters();
|
||||
// }
|
||||
if(this.rememberPageLen){ Cookie.remove(this.pgLenCookie); }
|
||||
if(this.rememberPageNb){ Cookie.remove(this.pgNbCookie); }
|
||||
if(this.onAfterReset){ this.onAfterReset.call(null, this); }
|
||||
|
||||
this.emitter.emit('cleared-filters', this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2423,7 +2387,7 @@ export class TableFilter {
|
|||
* 'checklist' type)
|
||||
*/
|
||||
linkFilters(){
|
||||
if(!this.activeFilterId){
|
||||
if(!this.linkedFilters || !this.activeFilterId){
|
||||
return;
|
||||
}
|
||||
let slcA1 = this.getFiltersByType(this.fltTypeSlc, true),
|
||||
|
|
|
@ -12,9 +12,9 @@
|
|||
});
|
||||
|
||||
module('Behaviour');
|
||||
tf.setFilterValue(0, 'Hello');
|
||||
tf.filter();
|
||||
test('for filtered table', function() {
|
||||
tf.setFilterValue(0, 'Hello');
|
||||
tf.filter();
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
|
@ -29,68 +29,8 @@
|
|||
);
|
||||
});
|
||||
|
||||
tf.clearFilters();
|
||||
test('after filters are cleared', function() {
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
});
|
||||
|
||||
tf.destroy();
|
||||
tf = new TableFilter('demo', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
rows_always_visible: [4, 9],
|
||||
paging: true,
|
||||
paging_length: 2
|
||||
});
|
||||
tf.init();
|
||||
var paging = tf.feature('paging');
|
||||
|
||||
module('Behaviour with paging');
|
||||
tf.setFilterValue(0, 'Hello');
|
||||
tf.filter();
|
||||
test('for filtered table', function() {
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
});
|
||||
|
||||
tf.clearFilters();
|
||||
test('after filters are cleared', function() {
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
});
|
||||
|
||||
paging.setPage(2);
|
||||
test('after changing pagination page', function() {
|
||||
tf.clearFilters();
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
|
@ -104,8 +44,72 @@
|
|||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
|
||||
paging.setPage(0);
|
||||
testPaging();
|
||||
});
|
||||
|
||||
function testPaging(){
|
||||
tf.destroy();
|
||||
});
|
||||
tf = new TableFilter('demo', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
rows_always_visible: [4, 9],
|
||||
paging: true,
|
||||
paging_length: 2
|
||||
});
|
||||
tf.init();
|
||||
var paging = tf.feature('paging');
|
||||
|
||||
module('Behaviour with paging');
|
||||
test('for filtered table', function() {
|
||||
tf.setFilterValue(0, 'Hello');
|
||||
tf.filter();
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
});
|
||||
|
||||
test('after filters are cleared', function() {
|
||||
tf.clearFilters();
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'none',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'none',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
test('after changing pagination page', function() {
|
||||
paging.setPage(2);
|
||||
var alwaysVisibleRow1 = tf.tbl.rows[4];
|
||||
var alwaysVisibleRow2 = tf.tbl.rows[9];
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow1),
|
||||
'',
|
||||
'Row display for alwaysVisibleRow1'
|
||||
);
|
||||
deepEqual(
|
||||
tf.getRowDisplay(alwaysVisibleRow2),
|
||||
'none',
|
||||
'Row display for alwaysVisibleRow2'
|
||||
);
|
||||
|
||||
tf.destroy();
|
||||
});
|
||||
}
|
||||
|
||||
})(window, TableFilter);
|
||||
|
|
Loading…
Reference in a new issue