deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-16 21:36:41 +02:00
Code Issues Releases Wiki Activity

Fixed tests for reset feature behaviour unit test (grid-layout, paging)

Browse source
This commit is contained in:
Max Guglielmi 2016-01-14 19:35:46 +11:00
parent 3db685f0c9
commit ada1374ade
14 changed files with 114 additions and 10050 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.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.6 by Max Guglielmi
* build date: 2016-01-13T05:45:24.670Z
* build date: 2016-01-14T08:30:34.837Z
* 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}

7764
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
src/modules/gridLayout.js
View file

@ -110,7 +110,7 @@ export class GridLayout extends Feature{
this.tblMainCont.className = this.gridMainContCssClass;
if(this.gridWidth){
this.tblMainCont.style.width = this.gridWidth;
}console.log(tbl, tbl.parentNode);
}
tbl.parentNode.insertBefore(this.tblMainCont, tbl);
//Table container: div wrapping content table
@ -330,7 +330,7 @@ export class GridLayout extends Feature{
tbl.outerHTML = this.sourceTblHtml;
//needed to keep reference of table element for future usage
this.tf.tbl = t;
this.tf.tbl = Dom.id(tf.id);
this.initialized = false;
}

10
src/modules/paging.js
View file

@ -346,12 +346,12 @@ export class Paging extends Feature{
*/
reset(filterTable=false){
var tf = this.tf;
if(!tf.hasGrid() || this.isEnabled()){
if(this.isEnabled()){
return;
}
this.enable();
this.init();
tf.resetValues();
// tf.resetValues();
if(filterTable){
tf.filter();
}
@ -497,9 +497,9 @@ export class Paging extends Feature{
var tf = this.tf;
var evt = this.evt;
if(!tf.hasGrid() && !tf.isFirstLoad){
return;
}
// if(!tf.hasGrid() && !tf.isFirstLoad){
// return;
// }
if(this.resultsPerPageSlc || !this.resultsPerPage){
return;
}

4
src/modules/statusBar.js
View file

@ -178,7 +178,9 @@ export class StatusBar extends Feature{
let emitter = this.emitter;
this.statusBarDiv.innerHTML = '';
Dom.remove(this.statusBarDiv);
if(!this.statusBarTgtId){
Dom.remove(this.statusBarDiv);
}
this.statusBarSpan = null;
this.statusBarSpanText = null;
this.statusBarDiv = null;

114
src/tablefilter.js
View file

@ -617,12 +617,13 @@ export class TableFilter {
Mod.statusBar = new StatusBar(this);
Mod.statusBar.init();
}
if(this.paging || Mod.paging){
if(this.paging){
if(!Mod.paging){
Mod.paging = new Paging(this);
Mod.paging.init();
} else{
Mod.paging.reset();
}
Mod.paging.reset();
}
if(this.btnReset){
Mod.clearButton = new ClearButton(this);
@ -1008,6 +1009,7 @@ export class TableFilter {
Dom.removeClass(this.tbl, this.prfxTf);
this.nbHiddenRows = 0;
this.validRowsIndex = [];
this.fltIds = [];
this.activeFlt = null;
this._hasGrid = false;
}
@ -2207,69 +2209,69 @@ export class TableFilter {
/**
* Re-generate the filters grid bar when previously removed
*/
_resetGrid(){
if(this.isFirstLoad){
return;
}
// _resetGrid(){
// if(this.isFirstLoad){
// return;
// }
let Mod = this.Mod;
let tbl = this.tbl;
let rows = tbl.rows;
let filtersRowIndex = this.filtersRowIndex;
let filtersRow = rows[filtersRowIndex];
// let Mod = this.Mod;
// let tbl = this.tbl;
// let rows = tbl.rows;
// let filtersRowIndex = this.filtersRowIndex;
// let filtersRow = rows[filtersRowIndex];
// grid was removed, grid row element is stored in fltGridEl property
if(!this.gridLayout){
// If table has a thead ensure the filters row is appended in the
// thead element
if(tbl.tHead){
var tempRow = tbl.tHead.insertRow(this.filtersRowIndex);
tbl.tHead.replaceChild(this.fltGridEl, tempRow);
} else {
filtersRow.parentNode.insertBefore(this.fltGridEl, filtersRow);
}
// // grid was removed, grid row element is stored in fltGridEl property
// if(!this.gridLayout){
// // If table has a thead ensure the filters row is appended in the
// // thead element
// if(tbl.tHead){
// var tempRow = tbl.tHead.insertRow(this.filtersRowIndex);
// tbl.tHead.replaceChild(this.fltGridEl, tempRow);
// } else {
// filtersRow.parentNode.insertBefore(this.fltGridEl, filtersRow);
// }
Dom.addClass(tbl, this.prfxTf);
}
// Dom.addClass(tbl, this.prfxTf);
// }
// filters are appended in external placeholders elements
if(this.isExternalFlt){
let externalFltTgtIds = this.externalFltTgtIds;
for(let ct=0, len=externalFltTgtIds.length; ct<len; ct++){
let extFlt = Dom.id(externalFltTgtIds[ct]);
// // filters are appended in external placeholders elements
// if(this.isExternalFlt){
// let externalFltTgtIds = this.externalFltTgtIds;
// for(let ct=0, len=externalFltTgtIds.length; ct<len; ct++){
// let extFlt = Dom.id(externalFltTgtIds[ct]);
if(!extFlt){ continue; }
// if(!extFlt){ continue; }
let externalFltEl = this.externalFltEls[ct];
extFlt.appendChild(externalFltEl);
let colFltType = this.getFilterType(ct);
//IE special treatment for gridLayout, appended filters are
//empty
if(this.gridLayout &&
externalFltEl.innerHTML === '' &&
colFltType !== this.fltTypeInp){
if(colFltType === this.fltTypeSlc ||
colFltType === this.fltTypeMulti){
Mod.dropdown.build(ct);
}
if(colFltType === this.fltTypeCheckList){
Mod.checkList.build(ct);
}
}
}
}
// let externalFltEl = this.externalFltEls[ct];
// extFlt.appendChild(externalFltEl);
// let colFltType = this.getFilterType(ct);
// //IE special treatment for gridLayout, appended filters are
// //empty
// if(this.gridLayout &&
// externalFltEl.innerHTML === '' &&
// colFltType !== this.fltTypeInp){
// if(colFltType === this.fltTypeSlc ||
// colFltType === this.fltTypeMulti){
// Mod.dropdown.build(ct);
// }
// if(colFltType === this.fltTypeCheckList){
// Mod.checkList.build(ct);
// }
// }
// }
// }
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
this.nbRows = rows.length;
// this.nbFilterableRows = this.getRowsNb();
// this.nbVisibleRows = this.nbFilterableRows;
// this.nbRows = rows.length;
if(this.popupFilters){
this.headersRow++;
Mod.popupFilter.reset();
}
// if(this.popupFilters){
// this.headersRow++;
// Mod.popupFilter.reset();
// }
this._hasGrid = true;
}
// this._hasGrid = true;
// }
/**
* Determines if passed filter column implements exact query match

23
test/test-grid-layout.js
View file

@ -19,11 +19,18 @@ test('GridLayout component', function() {
deepEqual(tf.filtersRowIndex, 1, 'Filters row index');
});
// test('Destroy GridLayout component', function() {
// gridLayout.destroy();
// deepEqual(gridLayout.tblMainCont, null, 'Main container element removed');
// deepEqual(gridLayout.tblCont, null, 'Main HTML table container element removed');
// deepEqual(gridLayout.headTblCont, null, 'Headers container element removed');
// deepEqual(gridLayout.headTbl, null, 'Headers HTML table element removed');
// notEqual(gridLayout.sourceTblHtml, null, 'Table reference is kept');
// });
test('Destroy TableFilter', function() {
gridLayout.destroy();
deepEqual(gridLayout.tblMainCont, null, 'Main container element removed');
deepEqual(gridLayout.tblCont, null, 'Main HTML table container element removed');
deepEqual(gridLayout.headTblCont, null, 'Headers container element removed');
deepEqual(gridLayout.headTbl, null, 'Headers HTML table element removed');
notEqual(gridLayout.sourceTblHtml, null, 'Table reference is kept');
});
test('Reset TableFilter', function() {
tf.destroy();
tf.init();
deepEqual(tf instanceof TableFilter, true, 'TableFilter type');
deepEqual(typeof gridLayout, 'object', 'GridLayout instanciated');
});

9
test/test-paging.js
View file

@ -210,6 +210,15 @@ test('Set results per page', function() {
deepEqual(paging.nbPages, 2, 'Expected number of pages');
});
module('Reset feature');
test('can destroy and init TableFilter', function() {
tf.destroy();
tf.init();
notEqual(paging, null, 'Paging instanciated');
deepEqual(paging.pagingLength, 2, 'Paging length');
deepEqual(paging.nbPages, 4, 'Number of pages');
});
module('Tear-down');
test('can destroy TableFilter DOM elements', function() {
tf.destroy();