mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-17 22:06:41 +02:00
Removed nbRows property and replaced its usage by getRowsnb method
This commit is contained in:
Max Guglielmi
parent
457ad1032a
commit
dbf44d488a
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.2.28 - Starter</title>
|
||||
<title>tablefilter v0.2.29 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.2.28</h1>
|
||||
<h1>tablefilter v0.2.29</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* 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.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* 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.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* 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}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* 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}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.28 by Max Guglielmi
|
||||
* build date: 2016-05-19T02:46:18.585Z
|
||||
* tablefilter v0.2.29 by Max Guglielmi
|
||||
* build date: 2016-05-19T07:33:16.350Z
|
||||
* 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.2.28",
|
||||
"version": "0.2.29",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -328,7 +328,6 @@ export default class AdapterEzEditTable extends Feature {
|
|||
tf.emitter.emit('rows-changed', tf, this);
|
||||
//tf.feature('rowsCounter').refresh();
|
||||
} else {
|
||||
tf.nbRows++;
|
||||
tf.nbVisibleRows++;
|
||||
tf.nbFilterableRows++;
|
||||
tf.paging = false;
|
||||
|
|
@ -350,7 +349,6 @@ export default class AdapterEzEditTable extends Feature {
|
|||
// tf.feature('rowsCounter').refresh();
|
||||
tf.emitter.emit('rows-changed', tf, this);
|
||||
} else {
|
||||
tf.nbRows--;
|
||||
tf.nbVisibleRows--;
|
||||
tf.nbFilterableRows--;
|
||||
tf.paging = false;
|
||||
|
|
|
|||
|
|
@ -113,7 +113,8 @@ export class AlternateRows extends Feature {
|
|||
if(!this.initialized){
|
||||
return;
|
||||
}
|
||||
for(var i=0; i<this.tf.nbRows; i++){
|
||||
let nbRows = this.tf.getRowsNb(true);
|
||||
for(var i=0; i<nbRows; i++){
|
||||
this.removeRowBg(i);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -141,6 +141,7 @@ export class CheckList extends Feature {
|
|||
Event.add(ul, 'change', (evt) => this.onChange(evt));
|
||||
|
||||
let rows = tf.tbl.rows;
|
||||
let nbRows = tf.getRowsNb(true);
|
||||
this.isCustom = tf.isCustomOptions(colIndex);
|
||||
|
||||
let activeIdx;
|
||||
|
|
@ -156,7 +157,7 @@ export class CheckList extends Feature {
|
|||
|
||||
flt.innerHTML = '';
|
||||
|
||||
for (let k = tf.refRow; k < tf.nbRows; k++) {
|
||||
for (let k = tf.refRow; k < nbRows; k++) {
|
||||
// always visible rows don't need to appear on selects as always
|
||||
// valid
|
||||
if (tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1) {
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ export class Dropdown extends Feature {
|
|||
let slcId = tf.fltIds[colIndex];
|
||||
let slc = Dom.id(slcId),
|
||||
rows = tf.tbl.rows,
|
||||
nbRows = tf.getRowsNb(true),
|
||||
matchCase = tf.matchCase;
|
||||
|
||||
//custom select test
|
||||
|
|
@ -150,7 +151,7 @@ export class Dropdown extends Feature {
|
|||
filteredDataCol = [];
|
||||
}
|
||||
|
||||
for (let k = tf.refRow; k < tf.nbRows; k++) {
|
||||
for (let k = tf.refRow; k < nbRows; k++) {
|
||||
// always visible rows don't need to appear on selects as always
|
||||
// valid
|
||||
if (tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1) {
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ export class Paging extends Feature {
|
|||
this.prfxPgAfterSpan = 'pgafterspan_';
|
||||
|
||||
var start_row = tf.refRow;
|
||||
var nrows = tf.nbRows;
|
||||
var nrows = tf.getRowsNb(true);
|
||||
//calculates page nb
|
||||
this.nbPages = Math.ceil((nrows - start_row) / this.pagingLength);
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ export class TableFilter {
|
|||
this.headersRow = null;
|
||||
this.cfg = {};
|
||||
this.nbFilterableRows = null;
|
||||
this.nbRows = null;
|
||||
this.nbCells = null;
|
||||
this._hasGrid = false;
|
||||
|
||||
|
|
@ -452,7 +451,6 @@ export class TableFilter {
|
|||
|
||||
this.nbFilterableRows = this.getRowsNb();
|
||||
this.nbVisibleRows = this.nbFilterableRows;
|
||||
this.nbRows = this.tbl.rows.length;
|
||||
|
||||
// Generate filters
|
||||
for (let i = 0; i < n; i++) {
|
||||
|
|
@ -701,7 +699,6 @@ export class TableFilter {
|
|||
this.refRow = this.refRow > 0 ? this.refRow - 1 : 0;
|
||||
this.nbFilterableRows = this.getRowsNb();
|
||||
this.nbVisibleRows = this.nbFilterableRows;
|
||||
this.nbRows = this.nbFilterableRows + this.refRow;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1140,6 +1137,7 @@ export class TableFilter {
|
|||
this.emitter.emit('before-filtering', this);
|
||||
|
||||
let row = this.tbl.rows,
|
||||
nbRows = this.getRowsNb(true),
|
||||
hiddenrows = 0;
|
||||
|
||||
this.validRowsIndex = [];
|
||||
|
|
@ -1382,7 +1380,7 @@ export class TableFilter {
|
|||
return occurence;
|
||||
}//fn
|
||||
|
||||
for (let k = this.refRow; k < this.nbRows; k++) {
|
||||
for (let k = this.refRow; k < nbRows; k++) {
|
||||
// already filtered rows display re-init
|
||||
row[k].style.display = '';
|
||||
|
||||
|
|
@ -1500,14 +1498,15 @@ export class TableFilter {
|
|||
if (!this.fltGrid) {
|
||||
return;
|
||||
}
|
||||
let row = this.tbl.rows,
|
||||
colValues = [];
|
||||
let row = this.tbl.rows;
|
||||
let nbRows = this.getRowsNb(true);
|
||||
let colValues = [];
|
||||
|
||||
if (includeHeaders) {
|
||||
colValues.push(this.getHeadersText()[colIndex]);
|
||||
}
|
||||
|
||||
for (let i = this.refRow; i < this.nbRows; i++) {
|
||||
for (let i = this.refRow; i < nbRows; i++) {
|
||||
let isExludedRow = false;
|
||||
// checks if current row index appears in exclude array
|
||||
if (exclude.length > 0) {
|
||||
|
|
@ -1656,9 +1655,11 @@ export class TableFilter {
|
|||
* @return {Number} Number of filterable rows
|
||||
*/
|
||||
getRowsNb(includeHeaders) {
|
||||
let s = isUndef(this.refRow) ? 0 : this.refRow,
|
||||
ntrs = this.tbl.rows.length;
|
||||
if (includeHeaders) { s = 0; }
|
||||
let s = isUndef(this.refRow) ? 0 : this.refRow;
|
||||
let ntrs = this.tbl.rows.length;
|
||||
if (includeHeaders) {
|
||||
s = 0;
|
||||
}
|
||||
return parseInt(ntrs - s, 10);
|
||||
}
|
||||
|
||||
|
|
@ -1692,12 +1693,13 @@ export class TableFilter {
|
|||
*/
|
||||
getTableData(includeHeaders = false, excludeHiddenCols = false) {
|
||||
let rows = this.tbl.rows;
|
||||
let nbRows = this.getRowsNb(true);
|
||||
let tblData = [];
|
||||
if (includeHeaders) {
|
||||
let headers = this.getHeadersText(excludeHiddenCols);
|
||||
tblData.push([this.getHeadersRowIndex(), headers]);
|
||||
}
|
||||
for (let k = this.refRow; k < this.nbRows; k++) {
|
||||
for (let k = this.refRow; k < nbRows; k++) {
|
||||
let rowData = [k, []];
|
||||
let cells = rows[k].cells;
|
||||
for (let j = 0, len = cells.length; j < len; j++) {
|
||||
|
|
@ -1932,10 +1934,11 @@ export class TableFilter {
|
|||
if (!this.hasVisibleRows) {
|
||||
return;
|
||||
}
|
||||
let nbRows = this.getRowsNb(true);
|
||||
for (let i = 0, len = this.visibleRows.length; i < len; i++) {
|
||||
let row = this.visibleRows[i];
|
||||
//row index cannot be > nrows
|
||||
if (row <= this.nbRows) {
|
||||
if (row <= nbRows) {
|
||||
this.validateRow(row, true);
|
||||
}
|
||||
}
|
||||
|
|
@ -2188,8 +2191,9 @@ export class TableFilter {
|
|||
return this.validRowsIndex;
|
||||
}
|
||||
|
||||
let nbRows = this.getRowsNb(true);
|
||||
this.validRowsIndex = [];
|
||||
for (let k = this.refRow; k < this.getRowsNb(true); k++) {
|
||||
for (let k = this.refRow; k < nbRows; k++) {
|
||||
let r = this.tbl.rows[k];
|
||||
if (!this.paging) {
|
||||
if (this.getRowDisplay(r) !== NONE) {
|
||||
|
|
@ -2235,7 +2239,8 @@ export class TableFilter {
|
|||
* @return {Number}
|
||||
*/
|
||||
getLastRowIndex() {
|
||||
return (this.nbRows - 1);
|
||||
let nbRows = this.getRowsNb(true);
|
||||
return (nbRows - 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue