mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-06-01 05:23:02 +02:00
Merge pull request #87 from koalyptus/issue-86-cell-processed-event
Added cell-processed event, improved alternateRows
This commit is contained in:
commit
b41f7b25c6
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.1.2 - Starter</title>
|
||||
<title>tablefilter v0.1.3 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.1.2</h1>
|
||||
<h1>tablefilter v0.1.3</h1>
|
||||
|
||||
|
||||
|
||||
|
|
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* 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}
|
4
dist/tablefilter/style/filtersVisibility.css
vendored
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* 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}
|
4
dist/tablefilter/style/tablefilter.css
vendored
4
dist/tablefilter/style/tablefilter.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.1.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* 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.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* 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.2 by Max Guglielmi
|
||||
* build date: 2015-12-31T04:17:24.962Z
|
||||
* tablefilter v0.1.3 by Max Guglielmi
|
||||
* build date: 2016-01-02T03:37:45.442Z
|
||||
* 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}
|
12
dist/tablefilter/tablefilter.js
vendored
12
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
8
dist/tablefilter/tf-1.js
vendored
8
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.1.2",
|
||||
"version": "0.1.3",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
@ -46,6 +46,7 @@ export default class AdapterSortableTable{
|
|||
opts.on_after_sort : null;
|
||||
|
||||
this.tf = tf;
|
||||
this.emitter = this.tf.emitter;
|
||||
}
|
||||
|
||||
init(){
|
||||
|
@ -85,42 +86,6 @@ export default class AdapterSortableTable{
|
|||
this.stt.onsort = function(){
|
||||
adpt.sorted = true;
|
||||
|
||||
//rows alternating bg issue
|
||||
// TODO: move into AlternateRows component
|
||||
if(tf.alternateRows){
|
||||
let rows = tf.tbl.rows, c = 0;
|
||||
|
||||
let setClass = function(row, i, removeOnly){
|
||||
if(Types.isUndef(removeOnly)){
|
||||
removeOnly = false;
|
||||
}
|
||||
let altRows = tf.feature('alternateRows'),
|
||||
oddCls = altRows.oddCss,
|
||||
evenCls = altRows.evenCss;
|
||||
Dom.removeClass(row, oddCls);
|
||||
Dom.removeClass(row, evenCls);
|
||||
|
||||
if(!removeOnly){
|
||||
Dom.addClass(row, i % 2 ? oddCls : evenCls);
|
||||
}
|
||||
};
|
||||
|
||||
for (let i = tf.refRow; i < tf.nbRows; i++){
|
||||
let isRowValid = rows[i].getAttribute('validRow');
|
||||
if(tf.paging && rows[i].style.display === ''){
|
||||
setClass(rows[i], c);
|
||||
c++;
|
||||
} else {
|
||||
if((isRowValid==='true' || isRowValid===null) &&
|
||||
rows[i].style.display === ''){
|
||||
setClass(rows[i], c);
|
||||
c++;
|
||||
} else {
|
||||
setClass(rows[i], c, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//sort behaviour for paging
|
||||
if(tf.paging){
|
||||
let paginator = tf.feature('paging');
|
||||
|
@ -133,6 +98,8 @@ export default class AdapterSortableTable{
|
|||
if(adpt.onAfterSort){
|
||||
adpt.onAfterSort.call(null, tf, adpt.stt.sortColumn);
|
||||
}
|
||||
|
||||
adpt.emitter.emit('column-sorted', tf, adpt.stt.sortColumn);
|
||||
};
|
||||
|
||||
this.initialized = true;
|
||||
|
|
|
@ -25,8 +25,23 @@ export class AlternateRows extends Feature {
|
|||
return;
|
||||
}
|
||||
|
||||
this.processAll();
|
||||
|
||||
this.emitter.on('row-processed', (tf, rowIndex, arrIndex, isValid)=>
|
||||
this.processRow(rowIndex, arrIndex, isValid));
|
||||
this.emitter.on('row-paged', (tf, rowIndex, arrIndex, isValid)=>
|
||||
this.processRow(rowIndex, arrIndex, isValid));
|
||||
this.emitter.on('column-sorted', ()=> this.processAll());
|
||||
|
||||
this.initialized = true;
|
||||
}
|
||||
|
||||
processAll() {
|
||||
if(!this.isEnabled()){
|
||||
return;
|
||||
}
|
||||
var tf = this.tf;
|
||||
var validRowsIndex = tf.validRowsIndex;
|
||||
var validRowsIndex = tf.getValidRows(true);
|
||||
var noValidRowsIndex = validRowsIndex.length === 0;
|
||||
//1st index
|
||||
var beginIndex = noValidRowsIndex ? tf.refRow : 0;
|
||||
|
@ -42,11 +57,6 @@ export class AlternateRows extends Feature {
|
|||
this.setRowBg(rowIdx, idx);
|
||||
idx++;
|
||||
}
|
||||
|
||||
this.emitter.on('row-processed',
|
||||
(tf, rowIndex, isValid)=> this.processRow(rowIndex, isValid));
|
||||
|
||||
this.initialized = true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -54,9 +64,9 @@ export class AlternateRows extends Feature {
|
|||
* @param {Number} rowIdx Row index
|
||||
* @param {Boolean} isValid Valid row flag
|
||||
*/
|
||||
processRow(rowIdx, isValid) {
|
||||
processRow(rowIdx, arrIdx, isValid) {
|
||||
if(isValid){
|
||||
this.setRowBg(rowIdx, this.tf.validRowsIndex.length);
|
||||
this.setRowBg(rowIdx, arrIdx);
|
||||
} else {
|
||||
this.removeRowBg(rowIdx);
|
||||
}
|
||||
|
@ -106,8 +116,11 @@ export class AlternateRows extends Feature {
|
|||
this.removeRowBg(i);
|
||||
}
|
||||
|
||||
this.emitter.off('row-processed',
|
||||
(tf, rowIndex, isValid)=> this.processRow(rowIndex, isValid));
|
||||
this.emitter.off('row-processed', (tf, rowIndex, arrIndex, isValid)=>
|
||||
this.processRow(rowIndex, arrIndex, isValid));
|
||||
this.emitter.off('row-paged', (tf, rowIndex, arrIndex, isValid)=>
|
||||
this.processRow(rowIndex, arrIndex, isValid));
|
||||
this.emitter.off('column-sorted', ()=> this.processAll());
|
||||
|
||||
this.initialized = false;
|
||||
}
|
||||
|
|
|
@ -370,29 +370,13 @@ export class Paging extends Feature{
|
|||
* Refresh paging select according to number of pages
|
||||
* @param {Array} validRows Collection of valid rows
|
||||
*/
|
||||
setPagingInfo(validRows=[]){
|
||||
setPagingInfo(validRows){
|
||||
var tf = this.tf;
|
||||
var rows = tf.tbl.rows;
|
||||
var mdiv = !this.pagingTgtId ? tf.mDiv : Dom.id(this.pagingTgtId);
|
||||
var pgspan = Dom.id(this.prfxPgSpan+tf.id);
|
||||
|
||||
//store valid rows indexes
|
||||
tf.validRowsIndex = validRows;
|
||||
|
||||
if(validRows.length === 0){
|
||||
//counts rows to be grouped
|
||||
for(var j=tf.refRow; j<tf.nbRows; j++){
|
||||
var row = rows[j];
|
||||
if(!row){
|
||||
continue;
|
||||
}
|
||||
|
||||
var isRowValid = row.getAttribute('validRow');
|
||||
if(Types.isNull(isRowValid) || Boolean(isRowValid==='true')){
|
||||
tf.validRowsIndex.push(j);
|
||||
}
|
||||
}
|
||||
}
|
||||
tf.validRowsIndex = validRows || tf.getValidRows(true);
|
||||
|
||||
//calculate nb of pages
|
||||
this.nbPages = Math.ceil(tf.validRowsIndex.length/this.pagingLength);
|
||||
|
@ -428,7 +412,6 @@ export class Paging extends Feature{
|
|||
*/
|
||||
groupByPage(validRows){
|
||||
var tf = this.tf;
|
||||
var alternateRows = tf.feature('alternateRows');
|
||||
var rows = tf.tbl.rows;
|
||||
var startPagingRow = parseInt(this.startPagingRow, 10);
|
||||
var endPagingRow = startPagingRow + parseInt(this.pagingLength, 10);
|
||||
|
@ -443,20 +426,17 @@ export class Paging extends Feature{
|
|||
var validRowIdx = tf.validRowsIndex[h];
|
||||
var r = rows[validRowIdx];
|
||||
var isRowValid = r.getAttribute('validRow');
|
||||
var rowDisplayed = false;
|
||||
|
||||
if(h>=startPagingRow && h<endPagingRow){
|
||||
if(Types.isNull(isRowValid) || Boolean(isRowValid==='true')){
|
||||
r.style.display = '';
|
||||
}
|
||||
if(tf.alternateRows && alternateRows){
|
||||
alternateRows.setRowBg(validRowIdx, h);
|
||||
rowDisplayed = true;
|
||||
}
|
||||
} else {
|
||||
r.style.display = 'none';
|
||||
if(tf.alternateRows && alternateRows){
|
||||
alternateRows.removeRowBg(validRowIdx);
|
||||
}
|
||||
}
|
||||
this.emitter.emit('row-paged', tf, validRowIdx, h, rowDisplayed);
|
||||
}
|
||||
|
||||
tf.nbVisibleRows = tf.validRowsIndex.length;
|
||||
|
|
|
@ -104,6 +104,8 @@ export class PopupFilter extends Feature{
|
|||
// subscribe to events
|
||||
this.emitter.on('before-filtering', ()=> this.buildIcons());
|
||||
this.emitter.on('after-filtering', ()=> this.closeAll());
|
||||
this.emitter.on('cell-processed',
|
||||
(tf, cellIndex)=> this.buildIcon(cellIndex, true));
|
||||
|
||||
this.initialized = true;
|
||||
}
|
||||
|
@ -208,7 +210,7 @@ export class PopupFilter extends Feature{
|
|||
}
|
||||
|
||||
/**
|
||||
* Build specified icon
|
||||
* Apply specified icon state
|
||||
* @param {Number} colIndex Column index
|
||||
* @param {Boolean} active Apply active state
|
||||
*/
|
||||
|
@ -253,6 +255,8 @@ export class PopupFilter extends Feature{
|
|||
// unsubscribe to events
|
||||
this.emitter.off('before-filtering', ()=> this.buildIcons());
|
||||
this.emitter.off('after-filtering', ()=> this.closeAll());
|
||||
this.emitter.off('cell-processed',
|
||||
(tf, cellIndex)=> this.buildIcon(cellIndex, true));
|
||||
|
||||
this.initialized = false;
|
||||
}
|
||||
|
|
|
@ -931,10 +931,6 @@ export class TableFilter {
|
|||
Dom.addClass(this.tbl, this.prfxTf);
|
||||
}
|
||||
|
||||
if(this.loader){
|
||||
Mod.loader.show('none');
|
||||
}
|
||||
|
||||
/* Loads extensions */
|
||||
if(this.hasExtensions){
|
||||
this.initExtensions();
|
||||
|
@ -943,6 +939,8 @@ export class TableFilter {
|
|||
// Subscribe to events
|
||||
if(this.markActiveColumns){
|
||||
this.emitter.on('before-filtering', ()=> this.clearActiveColumns());
|
||||
this.emitter.on('cell-processed',
|
||||
(tf, colIndex)=> this.markActiveColumn(colIndex));
|
||||
}
|
||||
if(this.linkedFilters){
|
||||
this.emitter.on('after-filtering', ()=> this.linkFilters());
|
||||
|
@ -1210,6 +1208,8 @@ export class TableFilter {
|
|||
this.clearActiveColumns();
|
||||
this.emitter.off('before-filtering',
|
||||
()=> this.clearActiveColumns());
|
||||
this.emitter.off('cell-processed',
|
||||
(tf, colIndex)=> this.markActiveColumn(colIndex));
|
||||
}
|
||||
if(this.hasExtensions){
|
||||
this.destroyExtensions();
|
||||
|
@ -1753,7 +1753,7 @@ export class TableFilter {
|
|||
|
||||
for(let k=this.refRow; k<this.nbRows; k++){
|
||||
/*** if table already filtered some rows are not visible ***/
|
||||
if(row[k].style.display === 'none'){
|
||||
if(this.getRowDisplay(row[k]) === 'none'){
|
||||
row[k].style.display = '';
|
||||
}
|
||||
|
||||
|
@ -1822,22 +1822,8 @@ export class TableFilter {
|
|||
if(this.singleSearchFlt && occurence[j]){
|
||||
singleFltRowValid = true;
|
||||
}
|
||||
if(this.popupFilters){
|
||||
Mod.popupFilter.buildIcon(j, true);
|
||||
}
|
||||
if(this.markActiveColumns){
|
||||
if(k === this.refRow){
|
||||
if(this.onBeforeActiveColumn){
|
||||
this.onBeforeActiveColumn.call(null, this, j);
|
||||
}
|
||||
Dom.addClass(
|
||||
this.getHeaderElement(j),
|
||||
this.activeColumnsCssClass);
|
||||
if(this.onAfterActiveColumn){
|
||||
this.onAfterActiveColumn.call(null, this, j);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.emitter.emit('cell-processed', this, j, cell[j]);
|
||||
}//for j
|
||||
|
||||
if(this.singleSearchFlt && singleFltRowValid){
|
||||
|
@ -1850,7 +1836,9 @@ export class TableFilter {
|
|||
} else {
|
||||
this.validateRow(k, true);
|
||||
}
|
||||
this.emitter.emit('row-processed', this, k, isRowValid);
|
||||
|
||||
this.emitter.emit('row-processed', this, k,
|
||||
this.validRowsIndex.length, isRowValid);
|
||||
}// for k
|
||||
|
||||
this.nbVisibleRows = this.validRowsIndex.length;
|
||||
|
@ -2372,6 +2360,24 @@ export class TableFilter {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark currently filtered column
|
||||
* @param {Number} colIndex Column index
|
||||
*/
|
||||
markActiveColumn(colIndex){
|
||||
let header = this.getHeaderElement(colIndex);
|
||||
if(Dom.hasClass(header, this.activeColumnsCssClass)){
|
||||
return;
|
||||
}
|
||||
if(this.onBeforeActiveColumn){
|
||||
this.onBeforeActiveColumn.call(null, this, colIndex);
|
||||
}
|
||||
Dom.addClass(header, this.activeColumnsCssClass);
|
||||
if(this.onAfterActiveColumn){
|
||||
this.onAfterActiveColumn.call(null, this, colIndex);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh the filters subject to linking ('select', 'multiple',
|
||||
* 'checklist' type)
|
||||
|
|
|
@ -63,10 +63,6 @@ test('Can show loader', function() {
|
|||
loader.show('');
|
||||
deepEqual(loader.loaderDiv.style.display, '', 'Loader is displayed');
|
||||
});
|
||||
test('Can show loader', function() {
|
||||
loader.show('');
|
||||
deepEqual(loader.loaderDiv.style.display, '', 'Loader is displayed');
|
||||
});
|
||||
|
||||
module('Tear-down');
|
||||
test('can destroy TableFilter DOM elements', function() {
|
||||
|
|
|
@ -34,6 +34,32 @@ test('Pop-up filter UI elements', function() {
|
|||
deepEqual(fltIcn3, undefined, 'Filter icon does not exist for column 4');
|
||||
});
|
||||
|
||||
test('Pop-up filter state after filtering', function(){
|
||||
var fltIcn0 = popupFilter.popUpFltImgs[0];
|
||||
tf.setFilterValue(0, 'syd');
|
||||
tf.filter();
|
||||
|
||||
deepEqual(fltIcn0.src.indexOf('icn_filterActive') !== -1,
|
||||
true, 'Icon state');
|
||||
});
|
||||
|
||||
test('Pop-up filter state after clearing', function(){
|
||||
var fltIcn0 = popupFilter.popUpFltImgs[0];
|
||||
var fltIcn1 = popupFilter.popUpFltImgs[1];
|
||||
var fltIcn2 = popupFilter.popUpFltImgs[2];
|
||||
var fltIcn3 = popupFilter.popUpFltImgs[3];
|
||||
tf.clearFilters();
|
||||
|
||||
deepEqual(fltIcn0.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn1.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn2.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn3.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
});
|
||||
|
||||
test('TableFilter removed', function() {
|
||||
tf.destroy();
|
||||
var fltIcn1 = popupFilter.popUpFltImgs[3];
|
||||
|
@ -83,6 +109,34 @@ test('Pop-up filter UI elements with grid-layout', function() {
|
|||
deepEqual(fltIcn3, undefined, 'Filter icon does not exist for column 4');
|
||||
});
|
||||
|
||||
test('Pop-up filter state after filtering', function(){
|
||||
var popupFilter = tf.feature('popupFilter');
|
||||
var fltIcn0 = popupFilter.popUpFltImgs[0];
|
||||
tf.setFilterValue(0, 'syd');
|
||||
tf.filter();
|
||||
|
||||
deepEqual(fltIcn0.src.indexOf('icn_filterActive') !== -1,
|
||||
true, 'Icon state');
|
||||
});
|
||||
|
||||
test('Pop-up filter state after clearing', function(){
|
||||
var popupFilter = tf.feature('popupFilter');
|
||||
var fltIcn0 = popupFilter.popUpFltImgs[0];
|
||||
var fltIcn1 = popupFilter.popUpFltImgs[1];
|
||||
var fltIcn2 = popupFilter.popUpFltImgs[2];
|
||||
var fltIcn3 = popupFilter.popUpFltImgs[3];
|
||||
tf.clearFilters();
|
||||
|
||||
deepEqual(fltIcn0.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn1.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn2.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
deepEqual(fltIcn3.src.indexOf('icn_filterActive') === -1,
|
||||
true, 'Icon state');
|
||||
});
|
||||
|
||||
module('Feature interface');
|
||||
test('Properties', function() {
|
||||
var popupFilter = tf.feature('popupFilter');
|
||||
|
|
Loading…
Reference in a new issue