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

Cleaned destroy method of TableFilter class

Browse source
This commit is contained in:
Max Guglielmi 2016-01-14 21:13:19 +11:00
parent ada1374ade
commit bd9740c419
16 changed files with 104 additions and 99 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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-14T08:30:34.837Z
* build date: 2016-01-14T10:08:13.993Z
* 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
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
src/extensions/colOps/colOps.js
View file

@ -46,7 +46,7 @@ export default class ColOps{
*/
calc() {
var tf = this.tf;
if(!tf.isFirstLoad && !tf.hasGrid()){
if(!tf.hasGrid()){
return;
}

2
src/modules/alternateRows.js
View file

@ -112,7 +112,7 @@ export class AlternateRows extends Feature {
if(!this.initialized){
return;
}
for(var i=this.tf.refRow; i<this.tf.nbRows; i++){
for(var i=/*this.tf.refRow*/0; i<this.tf.nbRows; i++){
this.removeRowBg(i);
}

3
src/modules/checkList.js
View file

@ -188,8 +188,7 @@ export class CheckList extends Feature{
}
if(!Arr.has(filteredCol, cell_string, tf.matchCase) &&
!Arr.has(this.excludedOpts,
cell_string, tf.matchCase) &&
!tf.isFirstLoad){
cell_string, tf.matchCase)){
this.excludedOpts.push(cell_data);
}
}

3
src/modules/dropdown.js
View file

@ -199,8 +199,7 @@ export class Dropdown extends Feature{
}
if(!Arr.has(filteredCol, cell_string, matchCase) &&
!Arr.has(
excludedOpts, cell_string, matchCase) &&
!this.isFirstLoad){
excludedOpts, cell_string, matchCase)){
excludedOpts.push(cell_data);
}
}

10
src/modules/highlightKeywords.js
View file

@ -18,7 +18,10 @@ export class HighlightKeyword{
}
init(){
this.emitter.on(['before-filtering'], ()=> this.unhighlightAll());
this.emitter.on(
['before-filtering', 'destroy'],
()=> this.unhighlightAll()
);
}
/**
@ -112,6 +115,9 @@ export class HighlightKeyword{
}
destroy(){
this.emitter.off(['before-filtering'], ()=> this.unhighlightAll());
this.emitter.off(
['before-filtering', 'destroy'],
()=> this.unhighlightAll()
);
}
}

3
src/modules/paging.js
View file

@ -497,9 +497,6 @@ export class Paging extends Feature{
var tf = this.tf;
var evt = this.evt;
// if(!tf.hasGrid() && !tf.isFirstLoad){
// return;
// }
if(this.resultsPerPageSlc || !this.resultsPerPage){
return;
}

140
src/tablefilter.js
View file

@ -123,8 +123,6 @@ export class TableFilter {
this.validRowsIndex = [];
//stores filters row element
this.fltGridEl = null;
//is first load boolean
this.isFirstLoad = true;
//container div for paging elements, reset btn etc.
this.infDiv = null;
//div for rows counter
@ -544,63 +542,58 @@ export class TableFilter {
if(!this.fltGrid){
this._initNoFilters();
} else {
// if(this.isFirstLoad){
let fltrow = this._insertFiltersRow();
let fltrow = this._insertFiltersRow();
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
this.nbRows = this.tbl.rows.length;
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
this.nbRows = this.tbl.rows.length;
// Generate filters
for(let i=0; i<n; i++){
this.emitter.emit('before-filter-init', this, i);
// Generate filters
for(let i=0; i<n; i++){
this.emitter.emit('before-filter-init', this, i);
let fltcell = Dom.create(this.fltCellTag),
col = this.getFilterType(i);
let fltcell = Dom.create(this.fltCellTag),
col = this.getFilterType(i);
if(this.singleSearchFlt){
fltcell.colSpan = this.nbCells;
if(this.singleSearchFlt){
fltcell.colSpan = this.nbCells;
}
if(!this.gridLayout){
fltrow.appendChild(fltcell);
}
inpclass = (i==n-1 && this.displayBtn) ?
this.fltSmallCssClass : this.fltCssClass;
//only 1 input for single search
if(this.singleSearchFlt){
col = this.fltTypeInp;
inpclass = this.singleFltCssClass;
}
//drop-down filters
if(col===this.fltTypeSlc || col===this.fltTypeMulti){
if(!Mod.dropdown){
Mod.dropdown = new Dropdown(this);
}
if(!this.gridLayout){
fltrow.appendChild(fltcell);
Mod.dropdown.init(i, this.isExternalFlt, fltcell);
}
// checklist
else if(col===this.fltTypeCheckList){
if(!Mod.checkList){
Mod.checkList = new CheckList(this);
}
inpclass = (i==n-1 && this.displayBtn) ?
this.fltSmallCssClass : this.fltCssClass;
Mod.checkList.init(i, this.isExternalFlt, fltcell);
} else {
this._buildInputFilter(i, inpclass, fltcell);
}
//only 1 input for single search
if(this.singleSearchFlt){
col = this.fltTypeInp;
inpclass = this.singleFltCssClass;
}
// this adds submit button
if(i==n-1 && this.displayBtn){
this._buildSubmitButton(i, fltcell);
}
//drop-down filters
if(col===this.fltTypeSlc || col===this.fltTypeMulti){
if(!Mod.dropdown){
Mod.dropdown = new Dropdown(this);
}
Mod.dropdown.init(i, this.isExternalFlt, fltcell);
}
// checklist
else if(col===this.fltTypeCheckList){
if(!Mod.checkList){
Mod.checkList = new CheckList(this);
}
Mod.checkList.init(i, this.isExternalFlt, fltcell);
} else {
this._buildInputFilter(i, inpclass, fltcell);
}
// this adds submit button
if(i==n-1 && this.displayBtn){
this._buildSubmitButton(i, fltcell);
}
this.emitter.emit('after-filter-init', this, i);
}// for i
// } else {
// this._resetGrid();
// }//if isFirstLoad
this.emitter.emit('after-filter-init', this, i);
}
}//if this.fltGrid
@ -649,7 +642,6 @@ export class TableFilter {
Mod.noResults.init();
}
this.isFirstLoad = false;
this._hasGrid = true;
if(this.rememberGridValues || this.rememberPageLen ||
@ -951,7 +943,8 @@ export class TableFilter {
return;
}
let rows = this.tbl.rows,
Mod = this.Mod;
Mod = this.Mod,
emitter = this.emitter;
if(this.isExternalFlt && !this.popupFilters){
this.removeExternalFlts();
@ -959,36 +952,39 @@ export class TableFilter {
if(this.infDiv){
this.removeToolbar();
}
if(this.highlightKeywords){
Mod.highlightKeyword.unhighlightAll();
}
// if(this.highlightKeywords){
// Mod.highlightKeyword.unhighlightAll();
// }
if(this.markActiveColumns){
this.clearActiveColumns();
this.emitter.off(['before-filtering'],
()=> this.clearActiveColumns());
this.emitter.off(['cell-processed'],
emitter.off(['before-filtering'], ()=> this.clearActiveColumns());
emitter.off(['cell-processed'],
(tf, colIndex)=> this.markActiveColumn(colIndex));
}
if(this.hasExtensions){
this.destroyExtensions();
}
for(let j=this.refRow; j<this.nbRows; j++){
// validate row
this.validateRow(j, true);
// for(let j=this.refRow; j<this.nbRows; j++){
// // validate row
// this.validateRow(j, true);
//removes alternating colors
if(this.alternateRows){
Mod.alternateRows.removeRowBg(j);
}
// //removes alternating colors
// if(this.alternateRows){
// Mod.alternateRows.removeRowBg(j);
// }
}//for j
// }//for j
this.validateAllRows();
if(this.fltGrid && !this.gridLayout){
this.fltGridEl = rows[this.filtersRowIndex];
this.tbl.deleteRow(this.filtersRowIndex);
}
// broadcast destroy event
emitter.emit('destroy', this);
// Destroy modules
Object.keys(Mod).forEach(function(key){
var feature = Mod[key];
@ -999,11 +995,10 @@ export class TableFilter {
// unsubscribe to events
if(this.hasVisibleRows){
this.emitter.off(['after-filtering'],
()=> this.enforceVisibility());
emitter.off(['after-filtering'], ()=> this.enforceVisibility());
}
if(this.linkedFilters){
this.emitter.off(['after-filtering'], ()=> this.linkFilters());
emitter.off(['after-filtering'], ()=> this.linkFilters());
}
Dom.removeClass(this.tbl, this.prfxTf);
@ -1272,7 +1267,7 @@ export class TableFilter {
* TODO: Reduce complexity of this massive method
*/
filter(){
if(!this.fltGrid || (!this._hasGrid && !this.isFirstLoad)){
if(!this.fltGrid || !this._hasGrid){
return;
}
//invoke onbefore callback
@ -1981,8 +1976,7 @@ export class TableFilter {
* @param {String} searcharg Search term
*/
setFilterValue(index, searcharg=''){
if((!this.fltGrid && !this.isFirstLoad) ||
!this.getFilterElement(index)){
if(!this.fltGrid || !this.getFilterElement(index)){
return;
}
let slc = this.getFilterElement(index),

12
test/test-highlight-keywords.js
View file

@ -26,8 +26,18 @@ test('Highlighted keywords', function() {
0, 'Number of highlighted words');
});
module('Reset feature');
test('can destroy and init TableFilter', function() {
tf.destroy();
tf.init();
deepEqual(typeof highlightKeyword, 'object', 'Instanciated');
deepEqual(highlightKeyword.highlightedNodes instanceof Array,
true, 'Property check');
});
module('Tear-down');
test('can destroy TableFilter DOM elements', function() {
test('can destroy TableFilter DOM elements and clean highlighted words',
function() {
tf.setFilterValue(1, 'Perth');
tf.filter();
tf.destroy();