From 4a7f935272ad83c98454e256dab00be711d46729 Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Fri, 8 Jan 2016 17:44:22 +1100 Subject: [PATCH] Added the _buildInputFilter method --- dist/starter.html | 514 ------------------ dist/tablefilter/style/colsVisibility.css | 2 +- dist/tablefilter/style/filtersVisibility.css | 2 +- dist/tablefilter/style/tablefilter.css | 2 +- .../style/themes/default/default.css | 2 +- .../style/themes/mytheme/mytheme.css | 2 +- .../style/themes/skyblue/skyblue.css | 2 +- dist/tablefilter/tablefilter.js | 196 +++++-- src/modules/checkList.js | 24 +- src/modules/dropdown.js | 24 +- src/tablefilter.js | 145 +++-- test/test-popup-filter.js | 16 +- 12 files changed, 280 insertions(+), 651 deletions(-) delete mode 100644 dist/starter.html diff --git a/dist/starter.html b/dist/starter.html deleted file mode 100644 index b59dfa1e..00000000 --- a/dist/starter.html +++ /dev/null @@ -1,514 +0,0 @@ - - - - tablefilter v0.1.5 - Starter - - -

tablefilter v0.1.5

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
countryisoyearPOPXRATPPPcgdpccci
BeninBEN19985950.33589.9517822190.951178.4690.987.55
BeninBEN19996109.53615.6990967200.191174.9092.617.86
BeninBEN20006272.00711.9763184200.611224.7492.278.25
Burkina FasoBFA19949755.03555.2047119125.76838.7679.816.57
Burkina FasoBFA19959988.00499.148407136.65860.8980.419.29
Burkina FasoBFA199610225.00511.5523987144.18881.1180.4012.12
Burkina FasoBFA199710473.53583.6693726141.78899.0176.9414.94
RussiaRUS1998146899.019.7050828932.647086.3967.739.20
RussiaRUS1999146308.9924.61993984.038074.7057.358.81
RussiaRUS2000145555.0128.129169464.859995.9154.748.79
RwandaRWA19946230.00194.51750.39529.48132.164.48
RwandaRWA19956400.00262.197509870.67746.3492.773.08
RwandaRWA19966727.00306.820007377.90823.2589.713.21
RwandaRWA19977895.18301.529785284.13847.7991.443.72
RwandaRWA19988105.00312.314086985.32914.2289.344.22
El SalvadorSLV19955669.008.7545833593.544143.5989.3110.35
El SalvadorSLV19965798.008.7550001143.694235.7988.777.79
El SalvadorSLV19975911.008.7562503813.744408.4187.057.90
Slovak RepublicSVK20005401.0046.035213.0212618.5352.2224.78
SloveniaSVN19941988.90128.808593879.9711662.1253.2119.87
SloveniaSVN19951990.00118.518501389.0312574.9654.4623.11
SloveniaSVN19961991.00135.364303697.2713151.5154.3223.23
SloveniaSVN19971985.96159.6882935103.9614143.0253.2424.14
SloveniaSVN19981982.60166.134201108.9315067.3452.8225.35
ZambiaZMB19948740.72669.3706055307.48834.1975.439.86
ZambiaZMB19958980.00864.1192017402.40829.3776.5510.31
ZambiaZMB19969214.401207.900024515.01838.0578.7410.99
ZambiaZMB19979443.211314.498047596.97851.4777.5912.15
ZambiaZMB19989665.711862.06897744.91800.6985.1213.75
ZambiaZMB19999881.212388.019043941.87765.2491.8215.30
ZambiaZMB200010089.003110.8439941157.63840.9786.3315.38
ZimbabweZWE199410775.358.1515388492.012586.8460.1018.53
ZimbabweZWE199511011.008.665375712.152603.3766.8915.03
ZimbabweZWE199611242.1610.002349852.642860.2372.0611.32
ZimbabweZWE199711923.5212.111289983.172727.0682.8211.01
ZimbabweZWE199812153.8523.679109574.062799.8577.6610.75
ZimbabweZWE199912388.3238.301200876.122770.4876.8910.73
ZimbabweZWE200012627.0044.417919169.482607.0369.238.62
- - - - - - -

-
-
-
-
-
-
-
-
-
diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css
index 32a0cc1c..5eaa7dc9 100644
--- a/dist/tablefilter/style/colsVisibility.css
+++ b/dist/tablefilter/style/colsVisibility.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 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}
\ No newline at end of file
diff --git a/dist/tablefilter/style/filtersVisibility.css b/dist/tablefilter/style/filtersVisibility.css
index 38f65843..114c238a 100644
--- a/dist/tablefilter/style/filtersVisibility.css
+++ b/dist/tablefilter/style/filtersVisibility.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 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}
\ No newline at end of file
diff --git a/dist/tablefilter/style/tablefilter.css b/dist/tablefilter/style/tablefilter.css
index 1c396d27..6cb4d24c 100644
--- a/dist/tablefilter/style/tablefilter.css
+++ b/dist/tablefilter/style/tablefilter.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 MIT License  
  */ 
 .activeHeader{background-color:#66afe9 !important;color:#fff !important}
diff --git a/dist/tablefilter/style/themes/default/default.css b/dist/tablefilter/style/themes/default/default.css
index 4cf783f2..a9c01255 100644
--- a/dist/tablefilter/style/themes/default/default.css
+++ b/dist/tablefilter/style/themes/default/default.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 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}
\ No newline at end of file
diff --git a/dist/tablefilter/style/themes/mytheme/mytheme.css b/dist/tablefilter/style/themes/mytheme/mytheme.css
index 6cdd9cdb..916aaae7 100644
--- a/dist/tablefilter/style/themes/mytheme/mytheme.css
+++ b/dist/tablefilter/style/themes/mytheme/mytheme.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 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}
\ No newline at end of file
diff --git a/dist/tablefilter/style/themes/skyblue/skyblue.css b/dist/tablefilter/style/themes/skyblue/skyblue.css
index 50f88c01..6a403440 100644
--- a/dist/tablefilter/style/themes/skyblue/skyblue.css
+++ b/dist/tablefilter/style/themes/skyblue/skyblue.css
@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.5 by Max Guglielmi 
- *	 build date: 2016-01-06T05:07:26.429Z 
+ *	 build date: 2016-01-08T05:07:53.560Z 
  *	 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}
\ No newline at end of file
diff --git a/dist/tablefilter/tablefilter.js b/dist/tablefilter/tablefilter.js
index 845e404d..d24bd4d9 100644
--- a/dist/tablefilter/tablefilter.js
+++ b/dist/tablefilter/tablefilter.js
@@ -741,9 +741,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	            if (this._hasGrid) {
 	                return;
 	            }
-	            if (!this.tbl) {
-	                this.tbl = _dom2.default.id(this.id);
-	            }
+	            // if(!this.tbl){
+	            //     this.tbl = Dom.id(this.id);
+	            // }
 	            // if(this.gridLayout){
 	            //     this.refRow = this.startRow===null ? 0 : this.startRow;
 	            // }
@@ -938,36 +938,48 @@ return /******/ (function(modules) { // webpackBootstrap
 	                                //         Dom.text(checkList.activateCheckListTxt));
 	                                // }
 	                            } else {
+	                                    this._buildInputFilter(i, inpclass, fltcell);
 	                                    //show/hide input
-	                                    var inptype = col === this.fltTypeInp ? 'text' : 'hidden';
-	                                    var inp = _dom2.default.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;
-	                                    _event2.default.add(inp, 'focus', this.Evt.onInpFocus.bind(this));
+	                                    //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) {
-	                                        _dom2.default.id(externalFltTgtId).appendChild(inp);
-	                                        this.externalFltEls.push(inp);
-	                                    } else {
-	                                        fltcell.appendChild(inp);
-	                                    }
+	                                    // //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);
+	                                    // this.fltIds.push(this.prfxFlt+i+'_'+this.id);
 	
-	                                    _event2.default.add(inp, 'keypress', this.Evt.detectKey.bind(this));
-	                                    _event2.default.add(inp, 'keydown', this.Evt.onKeyDown.bind(this));
-	                                    _event2.default.add(inp, 'keyup', this.Evt.onKeyUp.bind(this));
-	                                    _event2.default.add(inp, 'blur', this.Evt.onInpBlur.bind(this));
+	                                    // 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) {
-	                                        var flts_values = this.Mod.store.getFilterValues(this.fltsValuesCookie);
-	                                        if (flts_values[i] != ' ') {
-	                                            this.setFilterValue(i, flts_values[i], false);
-	                                        }
-	                                    }
+	                                    // 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) {
@@ -1121,6 +1133,42 @@ return /******/ (function(modules) { // webpackBootstrap
 	            this.nbVisibleRows = this.nbFilterableRows;
 	            this.nbRows = this.nbFilterableRows + this.refRow;
 	        }
+	    }, {
+	        key: '_buildInputFilter',
+	        value: function _buildInputFilter(colIndex, cssClass, container) {
+	            var col = this.getFilterType(colIndex);
+	            var externalFltTgtId = this.isExternalFlt ? this.externalFltTgtIds[colIndex] : null;
+	            var inptype = col === this.fltTypeInp ? 'text' : 'hidden';
+	            var inp = _dom2.default.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] || '' : this.watermark);
+	            }
+	            inp.className = cssClass || this.fltCssClass;
+	            _event2.default.add(inp, 'focus', this.Evt.onInpFocus.bind(this));
+	
+	            //filter is appended in desired element
+	            if (externalFltTgtId) {
+	                _dom2.default.id(externalFltTgtId).appendChild(inp);
+	                this.externalFltEls.push(inp);
+	            } else {
+	                container.appendChild(inp);
+	            }
+	
+	            this.fltIds.push( /*this.prfxFlt+i+'_'+this.id*/inp.id);
+	
+	            _event2.default.add(inp, 'keypress', this.Evt.detectKey.bind(this));
+	            _event2.default.add(inp, 'keydown', this.Evt.onKeyDown.bind(this));
+	            _event2.default.add(inp, 'keyup', this.Evt.onKeyUp.bind(this));
+	            _event2.default.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);
+	            //     }
+	            // }
+	        }
 	
 	        /**
 	         * Return a feature instance for a given name
@@ -1375,7 +1423,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            this.validRowsIndex = [];
 	            this.activeFlt = null;
 	            this._hasGrid = false;
-	            this.tbl = null;
+	            // this.tbl = null;
 	        }
 	
 	        /**
@@ -1541,9 +1589,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }, {
 	        key: 'resetValues',
 	        value: function resetValues() {
+	            var _this5 = this;
+	
 	            //only loadFltOnDemand
-	            if (this.rememberGridValues && this.loadFltOnDemand) {
-	                this._resetGridValues(this.fltsValuesCookie);
+	            if (this.rememberGridValues) {
+	                if (this.loadFltOnDemand) {
+	                    this._resetGridValues(this.fltsValuesCookie);
+	                } else {
+	                    var fltValues = this.Mod.store.getFilterValues(this.fltsValuesCookie);
+	                    fltValues.forEach(function (val, idx) {
+	                        if (val !== ' ') {
+	                            _this5.setFilterValue(idx, val);
+	                        }
+	                    });
+	                }
 	            }
 	            this.filter();
 	        }
@@ -1624,6 +1683,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	                                checkList.setCheckListValues(li.check);
 	                                this.hasStoredValues = true;
 	                            }
+	                        } else if (fltType === this.fltTypeInp) {
+	                            this.setFilterValue(i, fltsValues[i]);
 	                        }
 	                } //end for
 	
@@ -2190,6 +2251,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	         *     [rowIndex, [value0, value1...]]
 	         * ]
 	         * @param  {Boolean} includeHeaders  Optional: include headers row
+	         * @param  {Boolean} excludeHiddenCols  Optional: exclude hidden columns
 	         * @return {Array}
 	         *
 	         * TODO: provide an API returning data in JSON format
@@ -2199,16 +2261,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	        key: 'getTableData',
 	        value: function getTableData() {
 	            var includeHeaders = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
+	            var excludeHiddenCols = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
 	
 	            var rows = this.tbl.rows;
 	            var tblData = [];
 	            if (includeHeaders) {
-	                tblData.push([this.getHeadersRowIndex(), this.getHeadersText()]);
+	                var headers = this.getHeadersText(excludeHiddenCols);
+	                tblData.push([this.getHeadersRowIndex(), headers]);
 	            }
 	            for (var k = this.refRow; k < this.nbRows; k++) {
 	                var rowData = [k, []];
 	                var cells = rows[k].cells;
 	                for (var j = 0, len = cells.length; j < len; j++) {
+	                    if (excludeHiddenCols && this.hasExtension('colsVisibility')) {
+	                        if (this.extension('colsVisibility').isColHidden(j)) {
+	                            continue;
+	                        }
+	                    }
 	                    var cellData = this.getCellData(cells[j]);
 	                    rowData[1].push(cellData);
 	                }
@@ -2224,6 +2293,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	         *     [rowIndex, [value0, value1...]]
 	         * ]
 	         * @param  {Boolean} includeHeaders  Optional: include headers row
+	         * @param  {Boolean} excludeHiddenCols  Optional: exclude hidden columns
 	         * @return {Array}
 	         *
 	         * TODO: provide an API returning data in JSON format
@@ -2233,6 +2303,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        key: 'getFilteredData',
 	        value: function getFilteredData() {
 	            var includeHeaders = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
+	            var excludeHiddenCols = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
 	
 	            if (!this.validRowsIndex) {
 	                return [];
@@ -2240,7 +2311,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            var rows = this.tbl.rows,
 	                filteredData = [];
 	            if (includeHeaders) {
-	                filteredData.push([this.getHeadersRowIndex(), this.getHeadersText()]);
+	                var headers = this.getHeadersText(excludeHiddenCols);
+	                filteredData.push([this.getHeadersRowIndex(), headers]);
 	            }
 	
 	            var validRows = this.getValidRows(true);
@@ -2248,6 +2320,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	                var rData = [this.validRowsIndex[i], []],
 	                    cells = rows[this.validRowsIndex[i]].cells;
 	                for (var k = 0; k < cells.length; k++) {
+	                    if (excludeHiddenCols && this.hasExtension('colsVisibility')) {
+	                        if (this.extension('colsVisibility').isColHidden(k)) {
+	                            continue;
+	                        }
+	                    }
 	                    var cellData = this.getCellData(cells[k]);
 	                    rData[1].push(cellData);
 	                }
@@ -2890,14 +2967,22 @@ return /******/ (function(modules) { // webpackBootstrap
 	
 	        /**
 	         * Return the list of headers' text
+	         * @param  {Boolean} excludeHiddenCols  Optional: exclude hidden columns
 	         * @return {Array} list of headers' text
 	         */
 	
 	    }, {
 	        key: 'getHeadersText',
 	        value: function getHeadersText() {
+	            var excludeHiddenCols = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
+	
 	            var headers = [];
 	            for (var j = 0; j < this.nbCells; j++) {
+	                if (excludeHiddenCols && this.hasExtension('colsVisibility')) {
+	                    if (this.extension('colsVisibility').isColHidden(j)) {
+	                        continue;
+	                    }
+	                }
 	                var header = this.getHeaderElement(j);
 	                var headerText = _dom2.default.getText(header);
 	                headers.push(headerText);
@@ -5146,16 +5231,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	            /*** remember grid values ***/
 	            var fltsValues = [],
 	                fltArr = [];
-	            if (tf.rememberGridValues) {
-	                fltsValues = tf.feature('store').getFilterValues(tf.fltsValuesCookie);
-	                if (fltsValues && !_string2.default.isEmpty(fltsValues.toString())) {
-	                    if (this.isCustom) {
-	                        fltArr.push(fltsValues[colIndex]);
-	                    } else {
-	                        fltArr = fltsValues[colIndex].split(' ' + tf.orOperator + ' ');
-	                    }
-	                }
-	            }
+	            // 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+' ');
+	            //         }
+	            //     }
+	            // }
 	
 	            var excludedOpts = null,
 	                filteredDataCol = null;
@@ -5271,7 +5357,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            //populates drop-down
 	            this.addOptions(colIndex, slc, isLinked, excludedOpts, fltsValues, fltArr);
 	
-	            this.emitter.emit('after-populating-filter', tf, colIndex);
+	            this.emitter.emit('after-populating-filter', tf, colIndex, slc);
 	        }
 	
 	        /**
@@ -5712,7 +5798,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            flt.appendChild(ul);
 	            flt.setAttribute('filled', '1');
 	
-	            this.emitter.emit('after-populating-filter', tf, colIndex);
+	            this.emitter.emit('after-populating-filter', tf, colIndex, flt);
 	        }
 	
 	        /**
@@ -5729,15 +5815,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	            var tf = this.tf;
 	            var chkCt = this.addTChecks(colIndex, ul);
 	            var fltArr = []; //remember grid values
-	            var store = tf.feature('store');
-	            var tmpVal = store ? store.getFilterValues(tf.fltsValuesCookie)[colIndex] : null;
-	            if (tmpVal && _string2.default.trim(tmpVal).length > 0) {
-	                if (tf.hasCustomSlcOptions && tf.customSlcOptions.cols.indexOf(colIndex) != -1) {
-	                    fltArr.push(tmpVal);
-	                } else {
-	                    fltArr = tmpVal.split(' ' + tf.orOperator + ' ');
-	                }
-	            }
+	            // 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 (var y = 0; y < this.opts.length; y++) {
 	                var val = this.opts[y]; //item value
diff --git a/src/modules/checkList.js b/src/modules/checkList.js
index f073d36b..0d0174de 100644
--- a/src/modules/checkList.js
+++ b/src/modules/checkList.js
@@ -264,7 +264,7 @@ export class CheckList extends Feature{
         flt.appendChild(ul);
         flt.setAttribute('filled', '1');
 
-        this.emitter.emit('after-populating-filter', tf, colIndex);
+        this.emitter.emit('after-populating-filter', tf, colIndex, flt);
     }
 
     /**
@@ -276,17 +276,17 @@ export class CheckList extends Feature{
         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+' ');
-            }
-        }
+        // 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 {
+                    if(val !== ' '){
+                        this.setFilterValue(idx, val);
+                    }
+                });
+            }
         }
         this.filter();
     }
@@ -1359,7 +1411,7 @@ export class TableFilter {
 
                     //selects
                     if(slcFltsIndex.indexOf(i) != -1){
-                        opt = Dom.createOpt(fltsValues[i],fltsValues[i],true);
+                        opt = Dom.createOpt(fltsValues[i], fltsValues[i], true);
                         slc.appendChild(opt);
                         this.hasStoredValues = true;
                     }
@@ -1376,7 +1428,7 @@ export class TableFilter {
                         }
                     }// if multiFltsIndex
                 }
-                else if(fltType===this.fltTypeCheckList){
+                else if(fltType === this.fltTypeCheckList){
                     let checkList = this.Mod.checkList;
                     let divChk = checkList.checkListDiv[i];
                     divChk.title = divChk.innerHTML;
@@ -1407,6 +1459,9 @@ export class TableFilter {
                         this.hasStoredValues = true;
                     }
                 }
+                else if(fltType === this.fltTypeInp){
+                    this.setFilterValue(i, fltsValues[i]);
+                }
             }//end for
 
             if(!this.hasStoredValues && this.paging){
diff --git a/test/test-popup-filter.js b/test/test-popup-filter.js
index f6031440..366c85c9 100644
--- a/test/test-popup-filter.js
+++ b/test/test-popup-filter.js
@@ -160,11 +160,11 @@ test('Properties', function() {
         'function', 'Feature enable method');
 });
 
-// module('Tear-down');
-// test('TableFilter removed', function() {
-//     tf.destroy();
-//     var fltIcn1 = popupFilter.popUpFltImgs[3];
-//     deepEqual(fltIcn1, undefined, 'Filter icon is removed');
-//     deepEqual(id(tf.fltIds[3]), null, 'Filter is removed');
-//     deepEqual(tf.hasGrid(), false, 'Filters removed');
-// });
+module('Tear-down');
+test('TableFilter removed', function() {
+    tf.destroy();
+    var fltIcn1 = popupFilter.popUpFltImgs[3];
+    deepEqual(fltIcn1, undefined, 'Filter icon is removed');
+    deepEqual(id(tf.fltIds[3]), null, 'Filter is removed');
+    deepEqual(tf.hasGrid(), false, 'Filters removed');
+});