deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-13 11:56:46 +02:00
Code Issues Releases Wiki Activity

Killed the nbVisibleRows property on TableFilter

Browse source
This commit is contained in:
Max Guglielmi 2016-05-26 14:36:36 +10:00
parent 73f72ce959
commit b23aeea53a
16 changed files with 10607 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/tablefilter/style/colsVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

2
dist/tablefilter/style/themes/default/default.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* 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}

2
dist/tablefilter/style/themes/mytheme/mytheme.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* 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}

2
dist/tablefilter/style/themes/skyblue/skyblue.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.32 by Max Guglielmi
* build date: 2016-05-26T02:16:44.975Z
* build date: 2016-05-26T02:02:24.179Z
* 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}

8237
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2349
dist/tablefilter/tf-1.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/extensions/advancedGrid/adapterEzEditTable.js
View file

@ -328,7 +328,6 @@ export default class AdapterEzEditTable extends Feature {
tf.emitter.emit('rows-changed', tf, this);
//tf.feature('rowsCounter').refresh();
} else {
tf.nbVisibleRows++;
tf.nbFilterableRows++;
tf.paging = false;
tf.feature('paging').destroy();
@ -349,7 +348,6 @@ export default class AdapterEzEditTable extends Feature {
// tf.feature('rowsCounter').refresh();
tf.emitter.emit('rows-changed', tf, this);
} else {
tf.nbVisibleRows--;
tf.nbFilterableRows--;
tf.paging = false;
tf.feature('paging').destroy();

2
src/modules/noResults.js
View file

@ -69,7 +69,7 @@ export class NoResults extends Feature {
}
toggle() {
if (this.tf.nbVisibleRows > 0) {
if (this.tf.getValidRowsNb() > 0) {
this.hide();
} else {
this.show();

4
src/modules/paging.js
View file

@ -419,7 +419,7 @@ export class Paging extends Feature {
}
//this loop shows valid rows of current page
for (var h = 0, len = tf.validRowsIndex.length; h < len; h++) {
for (var h = 0, len = tf.getValidRowsNb(true); h < len; h++) {
var validRowIdx = tf.validRowsIndex[h];
var r = rows[validRowIdx];
var isRowValid = r.getAttribute('validRow');
@ -436,8 +436,6 @@ export class Paging extends Feature {
this.emitter.emit('row-paged', tf, validRowIdx, h, rowDisplayed);
}
tf.nbVisibleRows = tf.validRowsIndex.length;
// broadcast grouping by page
this.emitter.emit('grouped-by-page', tf, this);
}

22
src/modules/rowsCounter.js
View file

@ -78,7 +78,7 @@ export class RowsCounter extends Feature {
// subscribe to events
this.emitter.on(['after-filtering', 'grouped-by-page'],
() => this.refresh(tf.nbVisibleRows));
() => this.refresh(tf.getValidRowsNb()));
this.emitter.on(['rows-changed'], () => this.refresh());
this.initialized = true;
@ -107,15 +107,15 @@ export class RowsCounter extends Feature {
var paging = tf.feature('paging');
if (paging) {
//paging start row
var paging_start_row = parseInt(paging.startPagingRow, 10) +
((tf.nbVisibleRows > 0) ? 1 : 0);
var paging_end_row =
(paging_start_row + paging.pagingLength) - 1 <=
tf.nbVisibleRows ?
paging_start_row + paging.pagingLength - 1 :
tf.nbVisibleRows;
totTxt = paging_start_row + this.fromToTextSeparator +
paging_end_row + this.overText + tf.nbVisibleRows;
var pagingStartRow = parseInt(paging.startPagingRow, 10) +
((tf.getValidRowsNb() > 0) ? 1 : 0);
var pagingEndRow =
(pagingStartRow + paging.pagingLength) - 1 <=
tf.getValidRowsNb() ?
pagingStartRow + paging.pagingLength - 1 :
tf.getValidRowsNb();
totTxt = pagingStartRow + this.fromToTextSeparator +
pagingEndRow + this.overText + tf.getValidRowsNb();
}
}
@ -141,7 +141,7 @@ export class RowsCounter extends Feature {
// unsubscribe to events
this.emitter.off(['after-filtering', 'grouped-by-page'],
() => this.refresh(tf.nbVisibleRows));
() => this.refresh(tf.getValidRowsNb()));
this.emitter.off(['rows-changed'], () => this.refresh());
this.initialized = false;

2
src/string.js
View file

@ -38,7 +38,7 @@ export const rgxEsc = text => {
* @param {String} text
* @return {String} string
*/
export const matchCase = (text, caseSensitive) => {
export const matchCase = (text, caseSensitive = false) => {
if (!caseSensitive) {
return text.toLowerCase();
}

21
src/tablefilter.js
View file

@ -54,7 +54,7 @@ export class TableFilter {
this.refRow = null;
this.headersRow = null;
this.cfg = {};
this.nbFilterableRows = null;
this.nbFilterableRows = 0;
this.nbCells = null;
this._hasGrid = false;
@ -304,7 +304,6 @@ export class TableFilter {
/*** paging ***/
//enables/disables table paging
this.paging = Boolean(f.paging);
this.nbVisibleRows = 0; //nb visible rows
this.nbHiddenRows = 0; //nb hidden rows
/*** autofilter on typing ***/
@ -454,7 +453,6 @@ export class TableFilter {
let fltrow = this._insertFiltersRow();
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
// Generate filters
for (let i = 0; i < n; i++) {
@ -702,7 +700,6 @@ export class TableFilter {
}
this.refRow = this.refRow > 0 ? this.refRow - 1 : 0;
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
}
/**
@ -1142,7 +1139,7 @@ export class TableFilter {
let row = this.tbl.rows,
nbRows = this.getRowsNb(true),
hiddenrows = 0;
hiddenRows = 0;
this.validRowsIndex = [];
// search args re-init
@ -1463,7 +1460,7 @@ export class TableFilter {
if (!isRowValid) {
this.validateRow(k, false);
hiddenrows++;
hiddenRows++;
} else {
this.validateRow(k, true);
}
@ -1472,8 +1469,7 @@ export class TableFilter {
this.validRowsIndex.length, isRowValid);
}// for k
this.nbVisibleRows = this.validRowsIndex.length;
this.nbHiddenRows = hiddenrows;
this.nbHiddenRows = hiddenRows;
//invokes onafterfilter callback
if (this.onAfterFilter) {
@ -2301,6 +2297,15 @@ export class TableFilter {
return this.getRowsNb(false);
}
/**
* Return the total number of valid rows
* @param {Boolean} [reCalc=false] Forces calculation of filtered rows
* @returns {Number}
*/
getValidRowsNb(reCalc = false) {
return this.getValidRows(reCalc).length;
}
/**
* Get the configuration object (literal object)
* @return {Object}

4
test/test-api.js
View file

@ -120,7 +120,7 @@ test('Activate filter for a specified column', function() {
test('Clear filters', function() {
tf.clearFilters();
deepEqual(tf.nbVisibleRows, 7, 'Filtered rows number');
deepEqual(tf.getValidRowsNb(), 7, 'Filtered rows number');
deepEqual(tf.getFiltersValue(), ['', '', '', '', '']);
});
@ -389,7 +389,7 @@ test('Filter table', function() {
test('Clear filters', function() {
tf.clearFilters();
deepEqual(tf.nbVisibleRows, 7, 'Filtered rows number');
deepEqual(tf.getValidRowsNb(), 7, 'Filtered rows number');
deepEqual(tf.getFiltersValue(), ['', '', '', '', '']);
});

4
test/test-paging.js
View file

@ -117,7 +117,7 @@ test('Filter from non starting page', function() {
tf.filter();
deepEqual(tf.validRowsIndex.length,
1, 'Expected valid rows after page change');
deepEqual(tf.nbVisibleRows,
deepEqual(tf.getValidRowsNb(),
1, 'Expected visible rows after page change');
});
@ -185,7 +185,7 @@ test('Filter from non starting page', function() {
tf.filter();
deepEqual(tf.validRowsIndex.length,
1, 'Expected valid rows after page change');
deepEqual(tf.nbVisibleRows,
deepEqual(tf.getValidRowsNb(),
1, 'Expected visible rows after page change');
});