Added watermark tests, removed commented out code

This commit is contained in:
Max Guglielmi 2016-01-11 12:41:25 +11:00
parent 93d902f235
commit 8427f58b2f
13 changed files with 189 additions and 292 deletions

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* 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}

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* 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}

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* 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}

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* 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}

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.718Z
* build date: 2016-01-11T01:32:31.472Z
* 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}

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-09T10:12:44.628Z
* build date: 2016-01-11T01:32:31.388Z
* MIT License
*/

View File

@ -132,7 +132,7 @@ export class CheckList extends Feature{
let ul = Dom.create(
'ul', ['id', tf.fltIds[colIndex]], ['colIndex', colIndex]);
ul.className = this.checkListCssClass;
Event.add(ul, 'change', (evt) => { this.onChange(evt); });
Event.add(ul, 'change', (evt) => this.onChange(evt));
let rows = tf.tbl.rows;
this.isCustom = tf.isCustomOptions(colIndex);
@ -275,18 +275,6 @@ export class CheckList extends Feature{
addChecks(colIndex, ul){
let tf = this.tf;
let chkCt = this.addTChecks(colIndex, ul);
// let fltArr = []; //remember grid values
// let store = tf.feature('store');
// let tmpVal = store ?
// store.getFilterValues(tf.fltsValuesCookie)[colIndex] : null;
// if(tmpVal && Str.trim(tmpVal).length > 0){
// if(tf.hasCustomSlcOptions &&
// tf.customSlcOptions.cols.indexOf(colIndex) != -1){
// fltArr.push(tmpVal);
// } else {
// fltArr = tmpVal.split(' '+tf.orOperator+' ');
// }
// }
for(let y=0; y<this.opts.length; y++){
let val = this.opts[y]; //item value
@ -301,8 +289,7 @@ export class CheckList extends Feature{
li.check.disabled = true;
li.disabled = true;
} else {
Event.add(li.check, 'click',
(evt) => { this.optionClick(evt); });
Event.add(li.check, 'click', (evt) => this.optionClick(evt));
}
ul.appendChild(li);
@ -310,18 +297,6 @@ export class CheckList extends Feature{
//item is hidden
li.style.display = 'none';
}
/*** remember grid values ***/
// if(tf.rememberGridValues){
// if((tf.hasCustomSlcOptions &&
// tf.customSlcOptions.cols.indexOf(colIndex) != -1 &&
// fltArr.toString().indexOf(val) != -1) ||
// Arr.has(fltArr,
// Str.matchCase(val, tf.matchCase), tf.matchCase)){
// li.check.checked = true;
// this.setCheckListValues(li.check);
// }
// }
}
}
@ -351,9 +326,7 @@ export class CheckList extends Feature{
tf.fltIds[colIndex]+'_1', tf.emOperator, tf.emptyText);
li1.className = this.checkListItemCssClass;
ul.appendChild(li1);
Event.add(li1.check, 'click', (evt) => {
this.optionClick(evt);
});
Event.add(li1.check, 'click', (evt) => this.optionClick(evt));
chkCt++;
}
@ -365,9 +338,7 @@ export class CheckList extends Feature{
);
li2.className = this.checkListItemCssClass;
ul.appendChild(li2);
Event.add(li2.check, 'click', (evt) => {
this.optionClick(evt);
});
Event.add(li2.check, 'click', (evt) => this.optionClick(evt));
chkCt++;
}
return chkCt;

View File

@ -68,7 +68,7 @@ export class Dropdown extends Feature{
container.appendChild(slc);
}
tf.fltIds.push(/*this.prfxFlt+i+'_'+this.id*/slc.id);
tf.fltIds.push(slc.id);
if(!tf.loadFltOnDemand){
this.build(colIndex);
@ -121,20 +121,6 @@ export class Dropdown extends Feature{
activeFlt = activeFlt.split(tf.prfxFlt)[1];
}
/*** remember grid values ***/
// let fltsValues = [], fltArr = [];
// if(tf.rememberGridValues){
// fltsValues = tf.feature('store').getFilterValues(
// tf.fltsValuesCookie);
// if(fltsValues && !Str.isEmpty(fltsValues.toString())){
// if(this.isCustom){
// fltArr.push(fltsValues[colIndex]);
// } else {
// fltArr = fltsValues[colIndex].split(' '+tf.orOperator+' ');
// }
// }
// }
let excludedOpts = null,
filteredDataCol = null;
if(isLinked && tf.disableExcludedOptions){
@ -257,8 +243,7 @@ export class Dropdown extends Feature{
}
//populates drop-down
this.addOptions(
colIndex, slc, isLinked, excludedOpts/*, fltsValues, fltArr*/);
this.addOptions(colIndex, slc, isLinked, excludedOpts);
this.emitter.emit('after-populating-filter', tf, colIndex, slc);
}
@ -312,24 +297,6 @@ export class Dropdown extends Feature{
opt = Dom.createOpt(lbl, val, true);
} else {
opt = Dom.createOpt(lbl, val, false);
// if(tf.getFilterType(colIndex) !== tf.fltTypeMulti){
// opt = Dom.createOpt(
// lbl,
// val,
// (fltsValues[colIndex]!==' ' &&
// val===fltsValues[colIndex]) ? true : false
// );
// } else {
// opt = Dom.createOpt(
// lbl,
// val,
// (Arr.has(fltArr,
// Str.matchCase(this.opts[y], tf.matchCase),
// tf.matchCase) ||
// fltArr.toString().indexOf(val)!== -1) ?
// true : false
// );
// }
}
if(isDisabled){
opt.disabled = true;

View File

@ -109,15 +109,6 @@ export class TableFilter {
this.headersRow = isNaN(f.headers_row_index) ?
(this.filtersRowIndex === 0 ? 1 : 0) : f.headers_row_index;
// if(this.gridLayout){
// if(this.headersRow > 1){
// this.filtersRowIndex = this.headersRow+1;
// } else {
// this.filtersRowIndex = 1;
// this.headersRow = 0;
// }
// }
//defines tag of the cells containing filters (td/th)
this.fltCellTag = f.filters_cell_tag!=='th' ||
f.filters_cell_tag!=='td' ? 'td' : f.filters_cell_tag;
@ -429,7 +420,6 @@ export class TableFilter {
// Detect <enter> key
detectKey(e) {
if(!this.enterKey){ return; }
// let _ev = e || global.event;
if(e){
let key = Event.keyCode(e);
if(key===13){
@ -448,7 +438,6 @@ export class TableFilter {
if(!this.autoFilter){
return;
}
// let _ev = e || global.event;
let key = Event.keyCode(e);
this.isUserTyping = false;
@ -498,7 +487,6 @@ export class TableFilter {
},
// set focused text-box filter as active
onInpFocus(e) {
// let _ev = e || global.event;
let elm = Event.target(e);
this.activeFilterId = elm.getAttribute('id');
this.activeFlt = Dom.id(this.activeFilterId);
@ -538,21 +526,9 @@ export class TableFilter {
// filter columns on drop-down filter change
onSlcChange(e) {
if(!this.activeFlt){ return; }
// let _ev = e || global.event;
if(this.popupFilters){ Event.stop(e); }
if(this.onSlcChange){ this.filter(); }
}/*,
// fill checklist filter on click if required
onCheckListClick(e) {
let _ev = e || global.event;
let elm = Event.target(_ev);
if(this.loadFltOnDemand && elm.getAttribute('filled') === '0'){
let ct = elm.getAttribute('ct');
this.Mod.checkList.build(ct);
this.Mod.checkList.checkListDiv[ct].onclick = null;
this.Mod.checkList.checkListDiv[ct].title = '';
}
}*/
}
};
}
@ -565,17 +541,6 @@ export class TableFilter {
if(this._hasGrid){
return;
}
// if(!this.tbl){
// this.tbl = Dom.id(this.id);
// }
// if(this.gridLayout){
// this.refRow = this.startRow===null ? 0 : this.startRow;
// }
// if(this.popupFilters &&
// ((this.filtersRowIndex === 0 && this.headersRow === 1) ||
// this.gridLayout)){
// this.headersRow = 0;
// }
let Mod = this.Mod;
let n = this.singleSearchFlt ? 1 : this.nbCells,
@ -623,29 +588,6 @@ export class TableFilter {
} else {
if(this.isFirstLoad){
let fltrow = this._insertFiltersRow();
// if(!this.gridLayout){
// let thead = Dom.tag(this.tbl, 'thead');
// if(thead.length > 0){
// fltrow = thead[0].insertRow(this.filtersRowIndex);
// } else {
// fltrow = this.tbl.insertRow(this.filtersRowIndex);
// }
// if(this.headersRow > 1 &&
// this.filtersRowIndex <= this.headersRow &&
// !this.popupFilters){
// this.headersRow++;
// }
// if(this.popupFilters){
// this.headersRow++;
// }
// fltrow.className = this.fltsRowCssClass;
// if(this.isExternalFlt || this.popupFilters){
// fltrow.style.display = 'none';
// }
// }
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
@ -653,16 +595,10 @@ export class TableFilter {
// Generate filters
for(let i=0; i<n; i++){
// if(this.popupFilters){
// Mod.popupFilter.build(i);
// }
this.emitter.emit('before-filter-init', this, i);
let fltcell = Dom.create(this.fltCellTag),
col = this.getFilterType(i)/*,
externalFltTgtId = this.isExternalFlt ?
this.externalFltTgtIds[i] : null*/;
col = this.getFilterType(i);
if(this.singleSearchFlt){
fltcell.colSpan = this.nbCells;
@ -685,144 +621,21 @@ export class TableFilter {
Mod.dropdown = new Dropdown(this);
}
Mod.dropdown.init(i, this.isExternalFlt, fltcell);
// let dropdown = Mod.dropdown;
// let slc = Dom.create(this.fltTypeSlc,
// ['id', this.prfxFlt+i+'_'+this.id],
// ['ct', i], ['filled', '0']
// );
// if(col===this.fltTypeMulti){
// slc.multiple = this.fltTypeMulti;
// slc.title = dropdown.multipleSlcTooltip;
// }
// slc.className = Str.lower(col) === this.fltTypeSlc ?
// inpclass : this.fltMultiCssClass;
// //filter is appended in desired external element
// if(externalFltTgtId){
// Dom.id(externalFltTgtId).appendChild(slc);
// this.externalFltEls.push(slc);
// } else {
// fltcell.appendChild(slc);
// }
// this.fltIds.push(this.prfxFlt+i+'_'+this.id);
// if(!this.loadFltOnDemand){
// dropdown.build(i);
// }
// Event.add(slc, 'keypress',
// this.Evt.detectKey.bind(this));
// Event.add(slc, 'change',
// this.Evt.onSlcChange.bind(this));
// Event.add(slc, 'focus',
// this.Evt.onSlcFocus.bind(this));
// 1st option is created here since dropdown.build isn't
// invoked
// if(this.loadFltOnDemand){
// let opt0 = Dom.createOpt(this.displayAllText, '');
// slc.appendChild(opt0);
// }
}
// checklist
else if(col===this.fltTypeCheckList){
// let checkList;
// Mod.checkList = new CheckList(this);
// checkList = Mod.checkList;
if(!Mod.checkList){
Mod.checkList = new CheckList(this);
}
Mod.checkList.init(i, this.isExternalFlt, fltcell);
// let divCont = Dom.create('div',
// ['id', checkList.prfxCheckListDiv+i+'_'+this.id],
// ['ct', i], ['filled', '0']);
// divCont.className = checkList.checkListDivCssClass;
// //filter is appended in desired element
// if(externalFltTgtId){
// Dom.id(externalFltTgtId).appendChild(divCont);
// this.externalFltEls.push(divCont);
// } else {
// fltcell.appendChild(divCont);
// }
// checkList.checkListDiv[i] = divCont;
// this.fltIds.push(this.prfxFlt+i+'_'+this.id);
// if(!this.loadFltOnDemand){
// checkList.build(i);
// }
// if(this.loadFltOnDemand){
// Event.add(divCont, 'click',
// this.Evt.onCheckListClick.bind(this));
// divCont.appendChild(
// Dom.text(checkList.activateCheckListTxt));
// }
} else {
this._buildInputFilter(i, inpclass, fltcell);
//show/hide input
//let inptype = col===this.fltTypeInp ? 'text' :
//'hidden';
// let inp = Dom.create(this.fltTypeInp,
// ['id',this.prfxFlt+i+'_'+this.id],
// ['type',inptype], ['ct',i]);
// if(inptype!=='hidden' && this.watermark){
// inp.setAttribute(
// 'placeholder',
// this.isWatermarkArray ?
// (this.watermark[i] || '') : this.watermark
// );
// }
// inp.className = inpclass;
//Event.add(inp, 'focus',
//this.Evt.onInpFocus.bind(this));
// //filter is appended in desired element
// if(externalFltTgtId){
// Dom.id(externalFltTgtId).appendChild(inp);
// this.externalFltEls.push(inp);
// } else {
// fltcell.appendChild(inp);
// }
// this.fltIds.push(this.prfxFlt+i+'_'+this.id);
// Event.add(inp, 'keypress',
// this.Evt.detectKey.bind(this));
// Event.add(inp, 'keydown',
// this.Evt.onKeyDown.bind(this));
// Event.add(inp, 'keyup', this.Evt.onKeyUp.bind(this));
//Event.add(inp, 'blur', this.Evt.onInpBlur.bind(this));
// if(this.rememberGridValues){
// let flts_values = this.Mod.store.getFilterValues(
// this.fltsValuesCookie);
// if(flts_values[i]!=' '){
// this.setFilterValue(i, flts_values[i], false);
// }
// }
}
// this adds submit button
if(i==n-1 && this.displayBtn){
this._buildSubmitButton(i, fltcell);
// let btn = Dom.create(this.fltTypeInp,
// ['id', this.prfxValButton+i+'_'+this.id],
// ['type', 'button'], ['value', this.btnText]);
// btn.className = this.btnCssClass;
// //filter is appended in desired element
// if(externalFltTgtId){
// Dom.id(externalFltTgtId).appendChild(btn);
// } else{
// fltcell.appendChild(btn);
// }
// Event.add(btn, 'click', ()=> this.filter());
}//if
}
this.emitter.emit('after-filter-init', this, i);
}// for i
@ -929,8 +742,7 @@ export class TableFilter {
fltrow = this.tbl.insertRow(this.filtersRowIndex);
}
if(this.headersRow > 1 && this.filtersRowIndex <= this.headersRow /*&&
!this.popupFilters*/){
if(this.headersRow > 1 && this.filtersRowIndex <= this.headersRow){
this.headersRow++;
}
@ -941,7 +753,6 @@ export class TableFilter {
}
this.emitter.emit('filters-row-inserted', this, fltrow);
return fltrow;
}
@ -953,9 +764,6 @@ export class TableFilter {
return;
}
this.refRow = this.refRow > 0 ? this.refRow-1 : 0;
// if(this.gridLayout){
// this.refRow = 0;
// }
this.nbFilterableRows = this.getRowsNb();
this.nbVisibleRows = this.nbFilterableRows;
this.nbRows = this.nbFilterableRows + this.refRow;
@ -975,6 +783,7 @@ export class TableFilter {
let inp = Dom.create(this.fltTypeInp,
['id', this.prfxFlt+colIndex+'_'+this.id],
['type', inptype], ['ct', colIndex]);
if(inptype !== 'hidden' && this.watermark){
inp.setAttribute('placeholder',
this.isWatermarkArray ? (this.watermark[colIndex] || '') :
@ -984,7 +793,7 @@ export class TableFilter {
inp.className = cssClass || this.fltCssClass;
Event.add(inp, 'focus', this.Evt.onInpFocus.bind(this));
//filter is appended in desired element
//filter is appended in custom element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(inp);
this.externalFltEls.push(inp);
@ -992,20 +801,12 @@ export class TableFilter {
container.appendChild(inp);
}
this.fltIds.push(/*this.prfxFlt+i+'_'+this.id*/inp.id);
this.fltIds.push(inp.id);
Event.add(inp, 'keypress', this.Evt.detectKey.bind(this));
Event.add(inp, 'keydown', this.Evt.onKeyDown.bind(this));
Event.add(inp, 'keyup', this.Evt.onKeyUp.bind(this));
Event.add(inp, 'blur', this.Evt.onInpBlur.bind(this));
// if(this.rememberGridValues){
// let fltValues = this.Mod.store.getFilterValues(
// this.fltsValuesCookie);
// if(fltValues[colIndex]!=' '){
// this.setFilterValue(colIndex, fltValues[colIndex], false);
// }
// }
}
/**
@ -1021,7 +822,7 @@ export class TableFilter {
['type', 'button'], ['value', this.btnText]);
btn.className = this.btnCssClass;
//filter is appended in desired element
//filter is appended in custom element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(btn);
} else{
@ -1045,6 +846,8 @@ export class TableFilter {
*/
initExtensions(){
let exts = this.extensions;
// Set config's publicPath dynamically for Webpack...
__webpack_public_path__ = this.basePath;
this.emitter.emit('before-loading-extensions', this);
for(let i=0, len=exts.length; i<len; i++){
@ -1076,9 +879,7 @@ export class TableFilter {
modulePath = 'extensions/{}/{}'.replace(/{}/g, name);
}
// Trick to set config's publicPath dynamically for Webpack...
__webpack_public_path__ = this.basePath;
// Require pattern for Webpack
require(['./' + modulePath], (mod)=> {
let inst = new mod.default(this, ext);
inst.init();
@ -1193,8 +994,6 @@ export class TableFilter {
let rows = this.tbl.rows,
Mod = this.Mod;
// this.clearFilters();
if(this.isExternalFlt && !this.popupFilters){
this.removeExternalFlts();
}
@ -1253,7 +1052,6 @@ export class TableFilter {
this.validRowsIndex = [];
this.activeFlt = null;
this._hasGrid = false;
// this.tbl = null;
}
/**

80
test/test-watermark.html Normal file
View File

@ -0,0 +1,80 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>TableFilter watermark tests</title>
<link rel="stylesheet" href="libs/qunit/qunit.css">
<script src="libs/qunit/qunit.js"></script>
<script src="libs/polyfill.js"></script>
</head>
<body>
<table id="demo">
<thead>
<tr>
<th>From</th>
<th>Destination</th>
<th>Road Distance (km)</th>
<th>By Air (hrs)</th>
<th>By Rail (hrs)</th>
</tr>
</thead>
<tbody>
<tr>
<td><strong>Sydney</strong></td>
<td>Adelaide</td>
<td>1412</td>
<td>1.4</td>
<td>25.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Brisbane</td>
<td>982</td>
<td>1.5</td>
<td>16</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Canberra</td>
<td>286</td>
<td>.6</td>
<td>4.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Melbourne</td>
<td>872</td>
<td>1.1</td>
<td>10.5</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Perth</td>
<td>2781</td>
<td>3.1</td>
<td>38</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Alice Springs</td>
<td>1533</td>
<td>2</td>
<td>20.25</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Brisbane</td>
<td>2045</td>
<td>2.15</td>
<td>40</td>
</tr>
</tbody>
</table>
<script src="../dist/tablefilter/tablefilter.js"></script>
<script src="test-watermark.js"></script>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
</body>
</html>

81
test/test-watermark.js Normal file
View File

@ -0,0 +1,81 @@
(function(win, TableFilter){
var tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
watermark: 'foobar'
});
tf.init();
module('Sanity checks');
test('Watermark properties', function() {
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
deepEqual(tf.watermark, 'foobar', 'Property value');
deepEqual(tf.isWatermarkArray, false,
'Type: same watermark for all filters');
});
test('DOM element', function(){
var flt0 = tf.getFilterElement(0);
var flt1 = tf.getFilterElement(3);
deepEqual(flt0.placeholder, 'foobar', 'filter`s placeholder value');
deepEqual(flt1.placeholder, 'foobar', 'filter`s placeholder value');
});
module('Per column watermark');
test('Sanity checks', function() {
tf.destroy();
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
watermark: ['City', 'City', 'Distance', 'Time', 'Time']
});
tf.init();
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
deepEqual(tf.isWatermarkArray, true, 'Type: watermark array');
deepEqual(
tf.watermark,
['City', 'City', 'Distance', 'Time', 'Time'],
'Property value'
);
});
test('DOM element', function(){
deepEqual(
tf.getFilterElement(0).placeholder,
'City',
'filter`s placeholder value'
);
deepEqual(
tf.getFilterElement(1).placeholder,
'City',
'filter`s placeholder value'
);
deepEqual(
tf.getFilterElement(2).placeholder,
'Distance',
'filter`s placeholder value'
);
deepEqual(
tf.getFilterElement(3).placeholder,
'Time',
'filter`s placeholder value'
);
deepEqual(
tf.getFilterElement(4).placeholder,
'Time',
'filter`s placeholder value'
);
});
module('Tear-down');
test('TableFilter removed', function() {
tf.destroy();
deepEqual(tf.hasGrid(), false, 'Filters removed');
deepEqual(
tf.watermark,
['City', 'City', 'Distance', 'Time', 'Time'],
'Property value'
);
});
})(window, TableFilter);