Updated help feature tests

dist/tablefilter/style/colsVisibility.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 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}

dist/tablefilter/style/filtersVisibility.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 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}

dist/tablefilter/style/tablefilter.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 MIT License  
  */ 
 .activeHeader{background-color:#66afe9 !important;color:#fff !important}

dist/tablefilter/style/themes/default/default.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 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}

dist/tablefilter/style/themes/mytheme/mytheme.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 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}

dist/tablefilter/style/themes/skyblue/skyblue.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.1.7 by Max Guglielmi 
- *	 build date: 2016-01-18T06:33:59.227Z 
+ *	 build date: 2016-01-19T12:07:20.881Z 
  *	 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}

src/extensions/advancedGrid/adapterEzEditTable.js

@@ -47,7 +47,8 @@ export default class AdapterEzEditTable {
 
         // TODO: hack to prevent ezEditTable enter key event hijaking.
         // Needs to be fixed in the vendor's library
-        this.emitter.on(['filter-focus', 'filter-blur'], ()=> this.toggle());
+        this.emitter.on(['filter-focus', 'filter-blur'],
+            ()=> this._toggleForInputFilter());
     }
 
     /**
@@ -380,6 +381,18 @@ export default class AdapterEzEditTable {
         }
     }
 
+    _toggleForInputFilter(){
+        var tf = this.tf;
+        if(!tf.activeFlt){
+            return;
+        }
+        var colIndex = tf.activeFlt.getAttribute('ct');
+        var filterType = tf.getFilterType(colIndex);
+        if(filterType === tf.fltTypeInp){
+            this.toggle();
+        }
+    }
+
     /**
      * Remove advanced grid
      */
@@ -395,7 +408,8 @@ export default class AdapterEzEditTable {
             }
         }
 
-        this.emitter.off(['filter-focus', 'filter-blur'], ()=> this.toggle());
+        this.emitter.off(['filter-focus', 'filter-blur'],
+            ()=> this._toggleForInputFilter());
         this.initialized = false;
     }
 }

src/modules/help.js

@@ -59,6 +59,8 @@ export class Help extends Feature{
         this.prfxHelpSpan = 'helpSpan_';
         //id prefix for help elements
         this.prfxHelpDiv = 'helpDiv_';
+
+        this.emitter.on(['init-help'], ()=> this.init());
     }
 
     init(){

src/tablefilter.js

@@ -380,7 +380,6 @@ export class TableFilter {
         this.prfxCookiePageLen = 'tf_pglen_';
 
         /*** cookies ***/
-        // this.hasStoredValues = false;
         //remembers filters values on page load
         this.rememberGridValues = Boolean(f.remember_grid_values);
         //cookie storing filter values
@@ -500,6 +499,14 @@ export class TableFilter {
         //loads theme
         if(this.hasThemes){ this.loadThemes(); }
 
+        // Instantiate help feature and initialise only if set true
+        if(!Mod.help){
+            Mod.help = new Help(this);
+        }
+        if(this.help){
+            Mod.help.init();
+        }
+
         if(this.rememberGridValues || this.rememberPageNb ||
             this.rememberPageLen){
             if(!Mod.store){
@@ -618,12 +625,7 @@ export class TableFilter {
             Mod.clearButton = new ClearButton(this);
             Mod.clearButton.init();
         }
-        if(this.help){
-            if(!Mod.help){
-                Mod.help = new Help(this);
-            }
-            Mod.help.init();
-        }
+
         if(this.hasColWidths && !this.gridLayout){
             this.setColWidths();
         }
@@ -1045,14 +1047,9 @@ export class TableFilter {
         infdiv.appendChild(mdiv);
         this.mDiv = Dom.id(this.prfxMDiv+this.id);
 
-        // Enable help instructions by default if topbar is generated and not
-        // explicitely set to false
+        // emit help initialisation only if undefined
         if(Types.isUndef(this.help)){
-            if(!this.Mod.help){
-                this.Mod.help = new Help(this);
-            }
-            this.Mod.help.init();
-            this.help = true;
+            this.emitter.emit('init-help', this);
         }
     }
 
@@ -1207,8 +1204,6 @@ export class TableFilter {
                     w = Dom.getText(cell);
                 }
                 if(w !== ''){
-                    // Mod.highlightKeyword.highlight(
-                    //     cell, w, Mod.highlightKeyword.highlightCssClass);
                     this.emitter.emit('highlight-keyword', this, cell, w);
                 }
             }
@@ -2022,8 +2017,6 @@ export class TableFilter {
         // if(this.linkedFilters){
         //     this.linkFilters();
         // }
-        // if(this.rememberPageLen){ Cookie.remove(this.pgLenCookie); }
-        // if(this.rememberPageNb){ Cookie.remove(this.pgNbCookie); }
 
         this.filter();
 
@@ -2104,9 +2097,11 @@ export class TableFilter {
                 }
 
                 if(slcA3.indexOf(slcIndex[i]) != -1){
-                    this.Mod.checkList.build(slcIndex[i]);
+                    this.emitter.emit('build-checklist-filter', this,
+                        slcIndex[i], this.isExternalFlt);
                 } else {
-                    this.Mod.dropdown.build(slcIndex[i], true);
+                    this.emitter.emit('build-select-filter', this, slcIndex[i],
+                        true, this.isExternalFlt);
                 }
 
                 this.setFilterValue(slcIndex[i], slcSelectedValue);

test/test-help.js

@@ -88,6 +88,19 @@ test('Re-set UI', function() {
     notEqual(helpBtn.innerHTML.indexOf('→Help←'), -1, 'Help button text');
 });
 
+
+module('Destroy and re-init with help property undefined');
+test('Can init help when property is undefined and toolbar is set', function(){
+    tf.destroy();
+    tf.help = undefined;
+    tf.rowsCounter = true;
+    var help = tf.feature('help');
+    help.btnText = '?';
+    tf.init();
+
+    notEqual(help.btn, null, 'btn property');
+});
+
 module('Tear-down');
 test('can destroy TableFilter DOM elements', function() {
     tf.destroy();

test/test-highlight-keywords.js

@@ -23,7 +23,6 @@ test('Highlighted keywords', function() {
         'Number of applied CSS classes');
 
     tf.clearFilters();
-    tf.filter();
     deepEqual(highlightKeyword.highlightedNodes.length,
         0, 'Number of highlighted words');
     // TODO: uncomment when fixed