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

Added getActiveFilterId and setActiveFilterId methods

Browse source
This commit is contained in:
Max Guglielmi 2016-04-05 18:09:21 +02:00
parent 50b7ab616b
commit 3e13e787a1
15 changed files with 66 additions and 10207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.2.7 - Starter</title>
<title>tablefilter v0.2.8 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.7</h1>
<h1>tablefilter v0.2.8</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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.8 by Max Guglielmi
* build date: 2016-04-05T08:04:15.445Z
* build date: 2016-04-05T16:01:52.415Z
* 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}

7950
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -411,10 +411,10 @@ export default class AdapterEzEditTable {
_toggleForInputFilter(){
var tf = this.tf;
if(!tf.getActiveFilter()/*tf.activeFlt*/){
if(!tf.getActiveFilterId()){
return;
}
var colIndex = tf.getActiveFilter().getAttribute('ct');
var colIndex = tf.getColumnIndexFromFilterId(tf.getActiveFilterId());
var filterType = tf.getFilterType(colIndex);
if(filterType === tf.fltTypeInp){
this.toggle();

18
src/modules/checkList.js
View file

@ -53,8 +53,6 @@ export class CheckList extends Feature{
onChange(evt){
let elm = Event.target(evt);
let tf = this.tf;
// tf.activeFilterId = elm.getAttribute('id');
// tf.activeFlt = Dom.id(tf.activeFilterId);
this.emitter.emit('filter-focus', tf, elm);
tf.filter();
}
@ -143,10 +141,10 @@ export class CheckList extends Feature{
let rows = tf.tbl.rows;
this.isCustom = tf.isCustomOptions(colIndex);
let activeFlt;
if(tf.linkedFilters && tf.activeFilterId){
activeFlt = tf.activeFilterId.split('_')[0];
activeFlt = activeFlt.split(tf.prfxFlt)[1];
let activeIdx;
let activeFilterId = tf.getActiveFilterId();
if(tf.linkedFilters && activeFilterId){
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
}
let filteredDataCol = [];
@ -178,8 +176,8 @@ export class CheckList extends Feature{
(tf.linkedFilters && tf.disableExcludedOptions)))||
(colIndex === j && tf.linkedFilters &&
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && ((!activeFlt || activeFlt === colIndex )||
(activeFlt != colIndex &&
(tf.paging && ((!activeIdx || activeIdx === colIndex )||
(activeIdx != colIndex &&
tf.validRowsIndex.indexOf(k) != -1)) )))){
let cellData = tf.getCellData(cells[j]);
@ -352,9 +350,9 @@ export class CheckList extends Feature{
let tf = this.tf;
let chkValue = o.value; //checked item value
let chkIndex = parseInt(o.id.split('_')[2], 10);
// TODO: provide helper to extract column index, ugly!
let colIdx = o.id.split('_')[0].replace(tf.prfxFlt, '');
let chkIndex = parseInt(o.id.split('_')[2], 10);
let colIdx = tf.getColumnIndexFromFilterId(o.id);
let itemTag = 'LI';
let n = tf.getFilterElement(parseInt(colIdx, 10));

14
src/modules/dropdown.js
View file

@ -40,8 +40,6 @@ export class Dropdown extends Feature{
onSlcFocus(e) {
let elm = Event.target(e);
let tf = this.tf;
// tf.activeFilterId = elm.getAttribute('id');
// tf.activeFlt = Dom.id(tf.activeFilterId);
// select is populated when element has focus
if(tf.loadFltOnDemand && elm.getAttribute('filled') === '0'){
let ct = elm.getAttribute('ct');
@ -138,10 +136,10 @@ export class Dropdown extends Feature{
this.isCustom = tf.isCustomOptions(colIndex);
//custom selects text
let activeFlt;
if(isLinked && tf.activeFilterId){
activeFlt = tf.activeFilterId.split('_')[0];
activeFlt = activeFlt.split(tf.prfxFlt)[1];
let activeIdx;
let activeFilterId = tf.getActiveFilterId();
if(isLinked && activeFilterId){
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
}
let excludedOpts = null,
@ -177,8 +175,8 @@ export class Dropdown extends Feature{
(tf.paging && (!tf.validRowsIndex ||
(tf.validRowsIndex &&
tf.validRowsIndex.indexOf(k) != -1)) &&
((activeFlt === undefined || activeFlt === colIndex) ||
(activeFlt != colIndex &&
((activeIdx === undefined || activeIdx === colIndex) ||
(activeIdx != colIndex &&
tf.validRowsIndex.indexOf(k) != -1 ))) ))){
let cellData = tf.getCellData(cell[j]),
//Vary Peter's patch

39
src/tablefilter.js
View file

@ -184,8 +184,6 @@ export class TableFilter {
this.linkedFilters = Boolean(f.linked_filters);
//wheter excluded options are disabled
this.disableExcludedOptions = Boolean(f.disable_excluded_options);
//stores active filter element
// this.activeFlt = null;
//id of active filter
this.activeFilterId = null;
//enables always visible rows
@ -473,8 +471,6 @@ export class TableFilter {
// set focused text-box filter as active
onInpFocus(e) {
let elm = Event.target(e);
// this.activeFilterId = elm.getAttribute('id');
// this.activeFlt = Dom.id(this.activeFilterId);
this.emitter.emit('filter-focus', this, elm);
}
};
@ -1006,7 +1002,6 @@ export class TableFilter {
this.nbHiddenRows = 0;
this.validRowsIndex = [];
this.fltIds = [];
// this.activeFlt = null;
this._hasGrid = false;
this.initialized = false;
}
@ -2042,14 +2037,33 @@ export class TableFilter {
}
}
/**
* Return the ID of the current active filter
* @returns {String}
*/
getActiveFilterId(){
return this.activeFilterId;
}
setActiveFilterId(filterId){console.log(filterId);
/**
* Set the ID of the current active filter
* @param {String} filterId Element ID
*/
setActiveFilterId(filterId){
this.activeFilterId = filterId;
}
/**
* Return the column index for a given filter ID
* @param {string} [filterId=''] Filter ID
* @returns {Number} Column index
*/
getColumnIndexFromFilterId(filterId=''){
let idx = filterId.split('_')[0];
idx = idx.split(this.prfxFlt)[1];
return parseInt(idx, 10);
}
/**
* Refresh the filters subject to linking ('select', 'multiple',
* 'checklist' type)
@ -2064,8 +2078,7 @@ export class TableFilter {
slcIndex = slcA1.concat(slcA2);
slcIndex = slcIndex.concat(slcA3);
let activeFltIdx = this.activeFilterId.split('_')[0];
activeFltIdx = activeFltIdx.split(this.prfxFlt)[1];
let activeIdx = this.getColumnIndexFromFilterId(this.activeFilterId);
let slcSelectedValue;
for(let i=0, len=slcIndex.length; i<len; i++){
let curSlc = Dom.id(this.fltIds[slcIndex[i]]);
@ -2073,9 +2086,9 @@ export class TableFilter {
// Welcome to cyclomatic complexity hell :)
// TODO: simplify/refactor if statement
if(activeFltIdx !== slcIndex[i] ||
if(activeIdx !== slcIndex[i] ||
(this.paging && slcA1.indexOf(slcIndex[i]) != -1 &&
activeFltIdx === slcIndex[i] ) ||
activeIdx === slcIndex[i] ) ||
(!this.paging && (slcA3.indexOf(slcIndex[i]) != -1 ||
slcA2.indexOf(slcIndex[i]) != -1)) ||
slcSelectedValue === this.displayAllText ){
@ -2261,7 +2274,7 @@ export class TableFilter {
/**
* Get the header DOM element for a given column index
* @param {Number} colIndex Column index
* @return {Object}
* @return {Element}
*/
getHeaderElement(colIndex){
let table = this.gridLayout ? this.Mod.gridLayout.headTbl : this.tbl;
@ -2321,10 +2334,6 @@ export class TableFilter {
return this.getRowsNb(false);
}
getActiveFilter(){
return Dom.id(this.getActiveFilterId());
}
/**
* Get the configuration object (literal object)
* @return {Object}

2
test/test-checklist.js
View file

@ -30,7 +30,7 @@ test('Can filter on checkList change', function() {
var evObj = document.createEvent('HTMLEvents');
evObj.initEvent('change', true, true);
tf.activeFlt = flt1;
// tf.activeFlt = flt1;
tf.setFilterValue(3, '1.1');
flt1.dispatchEvent(evObj);

2
test/test-dropdown.js
View file

@ -29,7 +29,7 @@ test('Can filter on drop-down change', function() {
var evObj = document.createEvent('HTMLEvents');
evObj.initEvent('change', true, true);
tf.activeFlt = flt1;
// tf.activeFlt = flt1;
tf.setFilterValue(3, '1.1');
flt1.dispatchEvent(evObj);