Updated unit tests

dist/tablefilter/style/colsVisibility.css

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 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.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 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.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 MIT License  
  */ 
 .activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 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}

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

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 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}

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

@@ -1,6 +1,6 @@
 /** 
  *	 tablefilter v0.4.11 by Max Guglielmi 
- *	 build date: 2016-11-17T00:41:04.299Z 
+ *	 build date: 2016-11-17T12:56:26.762Z 
  *	 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/modules/popupFilter.js

@@ -1,8 +1,9 @@
 import {Feature} from '../feature';
 import {isFn, isUndef} from '../types';
 import {createElm, removeElm} from '../dom';
-import {addEvt, cancelEvt, stopEvt, targetEvt} from '../event';
+import {addEvt, cancelEvt, stopEvt, targetEvt, removeEvt} from '../event';
 import {INPUT, NONE, CHECKLIST, MULTIPLE} from '../const';
+import {root} from '../root';
 
 /**
  * Pop-up filter component
@@ -26,6 +27,13 @@ export class PopupFilter extends Feature {
         tf.isExternalFlt = true;
         tf.externalFltTgtIds = [];
 
+        /**
+         * Close active popup filter upon filtering, enabled by default
+         * @type {Boolean}
+         */
+        this.closeOnFiltering = f.popup_filters_close_on_filtering === false ?
+            false : true;
+
         /**
          * Filter icon path
          * @type {String}
@@ -122,6 +130,11 @@ export class PopupFilter extends Feature {
          */
         this.prfxDiv = 'popup_';
 
+        /**
+         * Column index of popup filter currently active
+         * @type {Number}
+         * @private
+         */
         this.activeFilterIdx = -1;
     }
 
@@ -146,6 +159,33 @@ export class PopupFilter extends Feature {
         stopEvt(evt);
     }
 
+    /**
+     * Mouse-up event handler handling popup filter auto-close behaviour
+     * @private
+     */
+    onMouseup(evt) {
+        if (this.activeFilterIdx === -1) {
+            return;
+        }
+        let targetElm = targetEvt(evt);
+        let activeFlt = this.fltElms[this.activeFilterIdx];
+        let icon = this.fltIcons[this.activeFilterIdx];
+
+        if (icon === targetElm) {
+            return;
+        }
+
+        while (targetElm && targetElm !== activeFlt) {
+            targetElm = targetElm.parentNode;
+        }
+
+        if (targetElm === activeFlt) {
+            return;
+        } else {
+            this.close(this.activeFilterIdx);
+        }
+    }
+
     /**
      * Initialize DOM elements
      */
@@ -190,6 +230,7 @@ export class PopupFilter extends Feature {
     reset() {
         this.enable();
         this.init();
+        this.buildIcons();
         this.buildAll();
     }
 
@@ -249,39 +290,65 @@ export class PopupFilter extends Feature {
      * @param  {Number} colIndex Column index
      */
     toggle(colIndex) {
+        if (!this.isOpen(colIndex)) {
+            this.open(colIndex);
+        } else {
+            this.close(colIndex);
+        }
+    }
+
+    /**
+     * Open popup filter of specified column
+     * @param {Number} colIndex Column index
+     */
+    open(colIndex) {
         let tf = this.tf,
             container = this.fltElms[colIndex];
 
-        if (container.style.display === NONE ||
+        if (this.onBeforeOpen) {
-            container.style.display === '') {
+            this.onBeforeOpen.call(null, this, container, colIndex);
-            if (this.onBeforeOpen) {
+        }
-                this.onBeforeOpen.call(
+        container.style.display = 'block';
-                    null, this, this.fltElms[colIndex], colIndex);
+        this.activeFilterIdx = colIndex;
-            }
+        addEvt(root, 'mouseup', (evt) => this.onMouseup(evt));
-            container.style.display = 'block';
+
-            this.activeFilterIdx = colIndex;
+        if (tf.getFilterType(colIndex) === INPUT) {
-            if (tf.getFilterType(colIndex) === INPUT) {
+            let flt = tf.getFilterElement(colIndex);
-                let flt = tf.getFilterElement(colIndex);
+            if (flt) {
-                if (flt) {
+                flt.focus();
-                    flt.focus();
-                }
-            }
-            if (this.onAfterOpen) {
-                this.onAfterOpen.call(
-                    null, this, this.fltElms[colIndex], colIndex);
-            }
-        } else {
-            if (this.onBeforeClose) {
-                this.onBeforeClose.call(
-                    null, this, this.fltElms[colIndex], colIndex);
-            }
-            container.style.display = NONE;
-            this.activeFilterIdx = -1;
-            if (this.onAfterClose) {
-                this.onAfterClose.call(
-                    null, this, this.fltElms[colIndex], colIndex);
             }
         }
+        if (this.onAfterOpen) {
+            this.onAfterOpen.call(null, this, container, colIndex);
+        }
+    }
+
+    /**
+     * Close popup filter of specified column
+     * @param {Number} colIndex Column index
+     */
+    close(colIndex) {
+        let container = this.fltElms[colIndex];
+        if (this.onBeforeClose) {
+            this.onBeforeClose.call(null, this, container, colIndex);
+        }
+        container.style.display = NONE;
+        if (this.activeFilterIdx === colIndex) {
+            this.activeFilterIdx = -1;
+        }
+        removeEvt(root, 'mouseup', (evt) => this.onMouseup(evt));
+        if (this.onAfterClose) {
+            this.onAfterClose.call(null, this, container, colIndex);
+        }
+    }
+
+    /**
+     * Check if popup filter for specified column is open
+     * @param {Number} colIndex Column index
+     * @returns {Boolean}
+     */
+    isOpen(colIndex) {
+        return this.fltElms[colIndex].style.display === 'block';
     }
 
     /**
@@ -289,18 +356,24 @@ export class PopupFilter extends Feature {
      * @param  {Number} exceptIdx Column index of the filter to not close
      */
     closeAll(exceptIdx) {
+        // Do not close filters only if argument is undefined and close on
+        // filtering option is disabled
+        if (isUndef(exceptIdx) && !this.closeOnFiltering) {
+            return;
+        }
         for (let i = 0; i < this.fltElms.length; i++) {
             if (i === exceptIdx) {
                 continue;
             }
-            let container = this.fltElms[i];
+            // let container = this.fltElms[i];
             let fltType = tf.getFilterType(i);
+            let isMultipleFilter =
+                (fltType === CHECKLIST || fltType === MULTIPLE);
 
             // Always hide all single selection filter types but hide multiple
             // selection filter types only if index set
-            if ((fltType !== CHECKLIST && fltType !== MULTIPLE) ||
+            if (!isMultipleFilter || !isUndef(exceptIdx)) {
-                !isUndef(exceptIdx)) {
+                this.close(i);
-                container.style.display = NONE;
             }
         }
     }
@@ -320,9 +393,9 @@ export class PopupFilter extends Feature {
      * @param  {Boolean} active   Apply active state
      */
     changeState(colIndex, active) {
-        if (this.fltIcons[colIndex]) {
+        let icon = this.fltIcons[colIndex];
-            this.fltIcons[colIndex].src = active ?
+        if (icon) {
-                this.activeIconPath : this.iconPath;
+            icon.src = active ? this.activeIconPath : this.iconPath;
         }
     }
 
@@ -357,6 +430,9 @@ export class PopupFilter extends Feature {
         this.fltSpans = [];
         this.fltIcons = [];
 
+        // TODO: expose an API to handle external filter IDs
+        tf.externalFltTgtIds = [];
+
         // unsubscribe to events
         this.emitter.off(['before-filtering'], () => this.setIconsState());
         this.emitter.off(['after-filtering'], () => this.closeAll());

test/test-external-filters.js

@@ -1,7 +1,82 @@
-(function(win, TableFilter){
-    var id = function (id){ return document.getElementById(id); };
 
-    var tf = new TableFilter('demo', {
+var id = function (id){ return document.getElementById(id); };
+
+var tf = new TableFilter('demo', {
+    base_path: '../dist/tablefilter/',
+    col_2: 'select',
+    col_3: 'multiple',
+    col_4: 'checklist',
+    /* external filters */
+    external_flt_grid: true,
+    external_flt_grid_ids: [
+        'extFrom',
+        'extDestination',
+        'extRoadDistance',
+        'extAirDistance',
+        'extRailDistance'
+    ]
+});
+tf.init();
+
+module('Sanity checks');
+test('External filters', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.isExternalFlt, true, 'Has external filters');
+    deepEqual(tf.externalFltTgtIds.length, 5,
+        'External filters ids length');
+    deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
+    deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');
+    deepEqual(tf.getStartRowIndex(), 2, 'Reference row index');
+    deepEqual(id('extFrom').childNodes.length>0, true,
+        'Col0 filter is external');
+    deepEqual(id('extDestination').childNodes.length>0, true,
+        'Col1 filter is external');
+    deepEqual(id('extRoadDistance').childNodes.length>0, true,
+        'Col2 filter is external');
+    deepEqual(id('extAirDistance').childNodes.length>0, true,
+        'Col3 filter is external');
+    deepEqual(id('extRailDistance').childNodes.length>0, true,
+        'Col4 filter is external');
+});
+
+module('Filter columns');
+test('Can filter column 0', function() {
+    tf.setFilterValue(0, 'Syd');
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
+});
+test('Can filter column 1', function() {
+    tf.clearFilters();
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [2], 'Filtered rows');
+});
+test('Can filter column 2', function() {
+    tf.clearFilters();
+    tf.setFilterValue(2, '1533');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [7], 'Filtered rows');
+});
+test('Can filter column 3', function() {
+    tf.clearFilters();
+    tf.setFilterValue(3, ['2', '3.1', '1.5']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
+});
+test('Can filter column 4', function() {
+    tf.clearFilters();
+    tf.setFilterValue(4, ['16', '40']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
+});
+
+// Filters in grid-layout mode are already considered as `external` as
+// generated in headers container
+module('Grid-layout');
+test('Sanity checks', function() {
+    tf.clearFilters();
+    tf.destroy();
+    tf = new TableFilter('demo', {
         base_path: '../dist/tablefilter/',
         col_2: 'select',
         col_3: 'multiple',
@@ -14,211 +89,134 @@
             'extRoadDistance',
             'extAirDistance',
             'extRailDistance'
-        ]
+        ],
+        grid_layout: true
     });
     tf.init();
 
-    module('Sanity checks');
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-    test('External filters', function() {
+    deepEqual(tf.isExternalFlt, true, 'Has external filters');
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.externalFltTgtIds.length, 5,
-        deepEqual(tf.isExternalFlt, true, 'Has external filters');
+        'External filters ids length');
-        deepEqual(tf.externalFltTgtIds.length, 5,
+    deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
-            'External filters ids length');
+    deepEqual(tf.getHeadersRowIndex(), 0, 'Headers row index');
-        deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
+    deepEqual(tf.getStartRowIndex(), 0, 'Reference row index');
-        deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');
+    deepEqual(id('extFrom').childNodes.length, 0,
-        deepEqual(tf.getStartRowIndex(), 2, 'Reference row index');
+        'Col0 filter is external');
-        deepEqual(id('extFrom').childNodes.length>0, true,
+    deepEqual(id('extDestination').childNodes.length, 0,
-            'Col0 filter is external');
+        'Col1 filter is external');
-        deepEqual(id('extDestination').childNodes.length>0, true,
+    deepEqual(id('extRoadDistance').childNodes.length, 0,
-            'Col1 filter is external');
+        'Col2 filter is external');
-        deepEqual(id('extRoadDistance').childNodes.length>0, true,
+    deepEqual(id('extAirDistance').childNodes.length, 0,
-            'Col2 filter is external');
+        'Col3 filter is external');
-        deepEqual(id('extAirDistance').childNodes.length>0, true,
+    deepEqual(id('extRailDistance').childNodes.length, 0,
-            'Col3 filter is external');
+        'Col4 filter is external');
-        deepEqual(id('extRailDistance').childNodes.length>0, true,
+});
-            'Col4 filter is external');
+test('Can filter column 0', function() {
-    });
+    tf.setFilterValue(0, 'Syd');
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
+});
+test('Can filter column 1', function() {
+    tf.clearFilters();
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [0], 'Filtered rows');
+});
+test('Can filter column 2', function() {
+    tf.clearFilters();
+    tf.setFilterValue(2, '1533');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [5], 'Filtered rows');
+});
+test('Can filter column 3', function() {
+    tf.clearFilters();
+    tf.setFilterValue(3, ['2', '3.1', '1.5']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
+});
+test('Can filter column 4', function() {
+    tf.clearFilters();
+    tf.setFilterValue(4, ['16', '40']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
+});
 
-    module('Filter columns');
+// In popup filters mode are already considered as `external` as
-    test('Can filter column 0', function() {
+// generated in headers container
-        tf.setFilterValue(0, 'Syd');
+module('Pop-up filters');
-        tf.filter();
+test('Sanity checks', function() {
-        deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
+    tf.clearFilters();
-    });
+    tf.destroy();
-    test('Can filter column 1', function() {
+    tf = new TableFilter('demo', {
-        tf.clearFilters();
+        base_path: '../dist/tablefilter/',
-        tf.setFilterValue(1, 'Ade');
+        col_2: 'select',
-        tf.filter();
+        col_3: 'multiple',
-        deepEqual(tf.getValidRows(), [2], 'Filtered rows');
+        col_4: 'checklist',
-    });
+        /* external filters */
-    test('Can filter column 2', function() {
+        external_flt_grid: true,
-        tf.clearFilters();
+        external_flt_grid_ids: [
-        tf.setFilterValue(2, '1533');
+            'extFrom',
-        tf.filter();
+            'extDestination',
-        deepEqual(tf.getValidRows(), [7], 'Filtered rows');
+            'extRoadDistance',
-    });
+            'extAirDistance',
-    test('Can filter column 3', function() {
+            'extRailDistance'
-        tf.clearFilters();
+        ],
-        tf.setFilterValue(3, ['2', '3.1', '1.5']);
+        popup_filters: true
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
-    });
-    test('Can filter column 4', function() {
-        tf.clearFilters();
-        tf.setFilterValue(4, ['16', '40']);
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
     });
+    tf.init();
 
-    // Filters in grid-layout mode are already considered as `external` as
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-    // generated in headers container
+    deepEqual(tf.isExternalFlt, true, 'Has external filters');
-    module('Grid-layout');
+    deepEqual(tf.externalFltTgtIds.length, 5,
-    test('Sanity checks', function() {
+        'External filters ids length');
-        tf.clearFilters();
+    deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
-        tf.destroy();
+    deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');
-        tf = new TableFilter('demo', {
+    deepEqual(tf.getStartRowIndex(), 2, 'Reference row index');
-            base_path: '../dist/tablefilter/',
+    deepEqual(id('extFrom').childNodes.length, 0,
-            col_2: 'select',
+        'Col0 filter is external');
-            col_3: 'multiple',
+    deepEqual(id('extDestination').childNodes.length, 0,
-            col_4: 'checklist',
+        'Col1 filter is external');
-            /* external filters */
+    deepEqual(id('extRoadDistance').childNodes.length, 0,
-            external_flt_grid: true,
+        'Col2 filter is external');
-            external_flt_grid_ids: [
+    deepEqual(id('extAirDistance').childNodes.length, 0,
-                'extFrom',
+        'Col3 filter is external');
-                'extDestination',
+    deepEqual(id('extRailDistance').childNodes.length, 0,
-                'extRoadDistance',
+        'Col4 filter is external');
-                'extAirDistance',
+});
-                'extRailDistance'
+test('Can filter column 0', function() {
-            ],
+    tf.setFilterValue(0, 'Syd');
-            grid_layout: true
+    tf.filter();
-        });
+    deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
-        tf.init();
+});
+test('Can filter column 1', function() {
+    tf.clearFilters();
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [2], 'Filtered rows');
+});
+test('Can filter column 2', function() {
+    tf.clearFilters();
+    tf.setFilterValue(2, '1533');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [7], 'Filtered rows');
+});
+test('Can filter column 3', function() {
+    tf.clearFilters();
+    tf.setFilterValue(3, ['2', '3.1', '1.5']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
+});
+test('Can filter column 4', function() {
+    tf.clearFilters();
+    tf.setFilterValue(4, ['16', '40']);
+    tf.filter();
+    deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
+});
 
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+module('Tear-down');
-        deepEqual(tf.isExternalFlt, true, 'Has external filters');
+test('TableFilter removed', function() {
-        deepEqual(tf.externalFltTgtIds.length, 5,
+    tf.clearFilters();
-            'External filters ids length');
+    tf.destroy();
-        deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
+    deepEqual(tf.isInitialized(), false, 'Filters removed');
-        deepEqual(tf.getHeadersRowIndex(), 0, 'Headers row index');
+});
-        deepEqual(tf.getStartRowIndex(), 0, 'Reference row index');
-        deepEqual(id('extFrom').childNodes.length, 0,
-            'Col0 filter is external');
-        deepEqual(id('extDestination').childNodes.length, 0,
-            'Col1 filter is external');
-        deepEqual(id('extRoadDistance').childNodes.length, 0,
-            'Col2 filter is external');
-        deepEqual(id('extAirDistance').childNodes.length, 0,
-            'Col3 filter is external');
-        deepEqual(id('extRailDistance').childNodes.length, 0,
-            'Col4 filter is external');
-    });
-    test('Can filter column 0', function() {
-        tf.setFilterValue(0, 'Syd');
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
-    });
-    test('Can filter column 1', function() {
-        tf.clearFilters();
-        tf.setFilterValue(1, 'Ade');
-        tf.filter();
-        deepEqual(tf.getValidRows(), [0], 'Filtered rows');
-    });
-    test('Can filter column 2', function() {
-        tf.clearFilters();
-        tf.setFilterValue(2, '1533');
-        tf.filter();
-        deepEqual(tf.getValidRows(), [5], 'Filtered rows');
-    });
-    test('Can filter column 3', function() {
-        tf.clearFilters();
-        tf.setFilterValue(3, ['2', '3.1', '1.5']);
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
-    });
-    test('Can filter column 4', function() {
-        tf.clearFilters();
-        tf.setFilterValue(4, ['16', '40']);
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
-    });
-
-    // In popup filters mode are already considered as `external` as
-    // generated in headers container
-    module('Pop-up filters');
-    test('Sanity checks', function() {
-        tf.clearFilters();
-        tf.destroy();
-        tf = new TableFilter('demo', {
-            base_path: '../dist/tablefilter/',
-            col_2: 'select',
-            col_3: 'multiple',
-            col_4: 'checklist',
-            /* external filters */
-            external_flt_grid: true,
-            external_flt_grid_ids: [
-                'extFrom',
-                'extDestination',
-                'extRoadDistance',
-                'extAirDistance',
-                'extRailDistance'
-            ],
-            popup_filters: true
-        });
-        tf.init();
-
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        deepEqual(tf.isExternalFlt, true, 'Has external filters');
-        deepEqual(tf.externalFltTgtIds.length, 5,
-            'External filters ids length');
-        deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
-        deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');
-        deepEqual(tf.getStartRowIndex(), 2, 'Reference row index');
-        deepEqual(id('extFrom').childNodes.length, 0,
-            'Col0 filter is external');
-        deepEqual(id('extDestination').childNodes.length, 0,
-            'Col1 filter is external');
-        deepEqual(id('extRoadDistance').childNodes.length, 0,
-            'Col2 filter is external');
-        deepEqual(id('extAirDistance').childNodes.length, 0,
-            'Col3 filter is external');
-        deepEqual(id('extRailDistance').childNodes.length, 0,
-            'Col4 filter is external');
-    });
-    test('Can filter column 0', function() {
-        tf.setFilterValue(0, 'Syd');
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 4, 'Filtered rows length');
-    });
-    test('Can filter column 1', function() {
-        tf.clearFilters();
-        tf.setFilterValue(1, 'Ade');
-        tf.filter();
-        deepEqual(tf.getValidRows(), [2], 'Filtered rows');
-    });
-    test('Can filter column 2', function() {
-        tf.clearFilters();
-        tf.setFilterValue(2, '1533');
-        tf.filter();
-        deepEqual(tf.getValidRows(), [7], 'Filtered rows');
-    });
-    test('Can filter column 3', function() {
-        tf.clearFilters();
-        tf.setFilterValue(3, ['2', '3.1', '1.5']);
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 3, 'Filtered rows');
-    });
-    test('Can filter column 4', function() {
-        tf.clearFilters();
-        tf.setFilterValue(4, ['16', '40']);
-        tf.filter();
-        deepEqual(tf.getValidRows().length, 2, 'Filtered rows');
-    });
-
-    module('Tear-down');
-    test('TableFilter removed', function() {
-        tf.clearFilters();
-        tf.destroy();
-        deepEqual(tf.isInitialized(), false, 'Filters removed');
-    });
-
-})(window, TableFilter);

test/test-grouped-headers.js

@@ -1,109 +1,106 @@
-(function(win, TableFilter){
 
-    var tf = new TableFilter('demo', 3, {
+var tf = new TableFilter('demo', 3, {
+    base_path: '../dist/tablefilter/',
+    filters_row_index: 3,
+    headers_row_index: 2
+});
+tf.init();
+
+module('Sanity checks');
+test('Grouped headers', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.getFiltersRowIndex(), 3, 'Filters row index');
+    deepEqual(tf.getHeadersRowIndex(), 2, 'Headers row index');
+    deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
+});
+
+test('Can perform a search', function() {
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+    deepEqual(tf.getValidRows(), [4], 'Filtered row');
+});
+
+module('Paging');
+test('Sanity checks', function() {
+    tf.clearFilters();
+    tf.destroy();
+    tf = new TableFilter('demo', 3, {
         base_path: '../dist/tablefilter/',
         filters_row_index: 3,
-        headers_row_index: 2
+        headers_row_index: 2,
+        paging: true,
+        paging_length: 3
     });
     tf.init();
 
-    module('Sanity checks');
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-    test('Grouped headers', function() {
+    deepEqual(tf.getFiltersRowIndex(), 3, 'Filters row index');
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.getHeadersRowIndex(), 2, 'Headers row index');
-        deepEqual(tf.getFiltersRowIndex(), 3, 'Filters row index');
+    deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
-        deepEqual(tf.getHeadersRowIndex(), 2, 'Headers row index');
+});
-        deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
+
+test('Can perform a search', function() {
+    tf.setFilterValue(2, '>100');
+    tf.filter();
+
+    deepEqual(tf.getValidRows(), [4, 5, 6, 7, 8, 9, 10], 'Filtered rows');
+    deepEqual(
+        tf.feature('paging').nbPages,
+        3,
+        'Number of pages for filtered rows'
+    );
+});
+
+module('Pop-up filters');
+test('Sanity checks', function() {
+    tf.clearFilters();
+    tf.feature('paging').destroy();
+    tf.destroy();
+    tf = new TableFilter('demo', 3, {
+        base_path: '../dist/tablefilter/',
+        headers_row_index: 2,
+        popup_filters: true
     });
+    tf.init();
 
-    test('Can perform a search', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        tf.setFilterValue(1, 'Ade');
+    deepEqual(tf.getHeadersRowIndex(), 3, 'Headers row index');
-        tf.filter();
+    deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
-        deepEqual(tf.getValidRows(), [4], 'Filtered row');
+});
+
+test('Can perform a search', function() {
+    tf.setFilterValue(1, 'Melb');
+    tf.filter();
+
+    deepEqual(tf.getValidRows(), [7], 'Filtered rows');
+});
+
+module('Pop-up filters, issue #295');
+test('Sanity checks', function() {
+    var tf2 = new TableFilter('demo2', 2, {
+        base_path: '../dist/tablefilter/',
+        headers_row_index: 1,
+        popup_filters: true
     });
+    tf2.init();
+    tf2.setFilterValue(1, 'Melb');
+    tf2.filter();
 
-    module('Paging');
+    deepEqual(tf2 instanceof TableFilter, true, 'TableFilter instanciated');
-    test('Sanity checks', function() {
+    deepEqual(tf2.getHeadersRowIndex(), 2, 'Headers row index');
-        tf.clearFilters();
+    deepEqual(tf2.getStartRowIndex(), 3, 'Reference row index');
-        tf.destroy();
+    deepEqual(tf2.getValidRows(), [6], 'Filtered rows');
-        tf = new TableFilter('demo', 3, {
-            base_path: '../dist/tablefilter/',
-            filters_row_index: 3,
-            headers_row_index: 2,
-            paging: true,
-            paging_length: 3
-        });
-        tf.init();
 
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    tf2.clearFilters();
-        deepEqual(tf.getFiltersRowIndex(), 3, 'Filters row index');
+    tf2.destroy();
-        deepEqual(tf.getHeadersRowIndex(), 2, 'Headers row index');
+    deepEqual(tf2.isInitialized(), false, 'Filters removed');
-        deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
+});
-    });
 
-    test('Can perform a search', function() {
+//Grid-layout currently does not support grouped headers
-        tf.setFilterValue(2, '>100');
-        tf.filter();
 
-        deepEqual(tf.getValidRows(), [4, 5, 6, 7, 8, 9, 10], 'Filtered rows');
+module('Tear-down');
-        deepEqual(
+test('TableFilter removed', function() {
-            tf.feature('paging').nbPages,
+    tf.clearFilters();
-            3,
+    tf.destroy();
-            'Number of pages for filtered rows'
+    deepEqual(tf.isInitialized(), false, 'Filters removed');
-        );
+});
-    });
-
-    module('Pop-up filters');
-    test('Sanity checks', function() {
-        tf.clearFilters();
-        tf.feature('paging').destroy();
-        tf.destroy();
-        tf = new TableFilter('demo', 3, {
-            base_path: '../dist/tablefilter/',
-            headers_row_index: 2,
-            popup_filters: true
-        });
-        tf.init();
-
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        deepEqual(tf.getHeadersRowIndex(), 3, 'Headers row index');
-        deepEqual(tf.getStartRowIndex(), 4, 'Reference row index');
-    });
-
-    test('Can perform a search', function() {
-        tf.setFilterValue(1, 'Melb');
-        tf.filter();
-
-        deepEqual(tf.getValidRows(), [7], 'Filtered rows');
-    });
-
-    module('Pop-up filters, issue #295');
-    test('Sanity checks', function() {
-        var tf2 = new TableFilter('demo2', 2, {
-            base_path: '../dist/tablefilter/',
-            headers_row_index: 1,
-            popup_filters: true
-        });
-        tf2.init();
-        tf2.setFilterValue(1, 'Melb');
-        tf2.filter();
-
-        deepEqual(tf2 instanceof TableFilter, true, 'TableFilter instanciated');
-        deepEqual(tf2.getHeadersRowIndex(), 2, 'Headers row index');
-        deepEqual(tf2.getStartRowIndex(), 3, 'Reference row index');
-        deepEqual(tf2.getValidRows(), [6], 'Filtered rows');
-
-        tf2.clearFilters();
-        tf2.destroy();
-        deepEqual(tf2.isInitialized(), false, 'Filters removed');
-    });
-
-    //Grid-layout currently does not support grouped headers
-
-    module('Tear-down');
-    test('TableFilter removed', function() {
-        tf.clearFilters();
-        tf.destroy();
-        deepEqual(tf.isInitialized(), false, 'Filters removed');
-    });
-
-})(window, TableFilter);

test/test-no-headers.js

@@ -1,101 +1,98 @@
-(function(win, TableFilter){
 
-    var tf = new TableFilter('demo', 0, {
+var tf = new TableFilter('demo', 0, {
-        base_path: '../dist/tablefilter/'
+    base_path: '../dist/tablefilter/'
+});
+tf.init();
+
+module('Sanity checks');
+test('No headers', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
+    deepEqual(tf.refRow, 1, 'Reference row index');
+    notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
+});
+
+test('Can perform a search', function() {
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+
+    deepEqual(tf.getValidRows(), [1], 'Filtered row');
+});
+
+test('Paging with no headers', function() {
+    tf.clearFilters();
+    tf.destroy();
+    tf = new TableFilter('demo', 0, {
+        base_path: '../dist/tablefilter/',
+        paging: true,
+        paging_length: 3
     });
     tf.init();
 
-    module('Sanity checks');
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-    test('No headers', function() {
+    deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+    deepEqual(tf.refRow, 1, 'Reference row index');
-        deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
+    notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
-        deepEqual(tf.refRow, 1, 'Reference row index');
+});
-        notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
+
+test('Can perform a search', function() {
+    tf.setFilterValue(1, 'Ade');
+    tf.filter();
+
+    deepEqual(tf.getValidRows(), [1], 'Filtered row');
+});
+
+// Grid layout currently does not handle a table with no headers...
+// Raised in issue 110 (https://github.com/koalyptus/TableFilter/issues/110)
+test('Grid layout with no header', function() {
+    tf.clearFilters();
+    tf.destroy();
+    tf = new TableFilter('demo', {
+        base_path: '../dist/tablefilter/',
+        grid_layout: true,
+        grid_no_headers: true
     });
+    tf.init();
 
-    test('Can perform a search', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        tf.setFilterValue(1, 'Ade');
+    deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
-        tf.filter();
+    deepEqual(tf.refRow, 0, 'Reference row index');
+    notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
+    deepEqual(tf.getRowsNb(), 7, 'Filterable rows number');
+});
+test('Can perform a search', function() {
+    tf.setFilterValue(2, '<900');
+    tf.filter();
 
-        deepEqual(tf.getValidRows(), [1], 'Filtered row');
+    deepEqual(tf.getValidRows(), [2,3], 'Filtered row');
+});
+
+// With no toolbar cannot clear filters :)
+test('Popup filters with no header', function() {
+    tf.clearFilters();
+    tf.destroy();
+    tf = new TableFilter('demo', 0, {
+        base_path: '../dist/tablefilter/',
+        popup_filters: true
     });
+    tf.init();
 
-    test('Paging with no headers', function() {
+    deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        tf.clearFilters();
+    deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
-        tf.destroy();
+    deepEqual(tf.refRow, 1, 'Reference row index');
-        tf = new TableFilter('demo', 0, {
+    notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
-            base_path: '../dist/tablefilter/',
+});
-            paging: true,
-            paging_length: 3
-        });
-        tf.init();
 
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
+test('Can perform a search', function() {
-        deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
+    tf.setFilterValue(1, 'Melbourne');
-        deepEqual(tf.refRow, 1, 'Reference row index');
+    tf.filter();
-        notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
-    });
 
-    test('Can perform a search', function() {
+    deepEqual(tf.getValidRows(), [4], 'Filtered row');
-        tf.setFilterValue(1, 'Ade');
+});
-        tf.filter();
 
-        deepEqual(tf.getValidRows(), [1], 'Filtered row');
+module('Tear-down');
-    });
+test('TableFilter removed', function() {
-
+    tf.clearFilters();
-    // Grid layout currently does not handle a table with no headers...
+    tf.destroy();
-    // Raised in issue 110 (https://github.com/koalyptus/TableFilter/issues/110)
+    deepEqual(tf.isInitialized(), false, 'Filters removed');
-    test('Grid layout with no header', function() {
+});
-        tf.clearFilters();
-        tf.destroy();
-        tf = new TableFilter('demo', {
-            base_path: '../dist/tablefilter/',
-            grid_layout: true,
-            grid_no_headers: true
-        });
-        tf.init();
-
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
-        deepEqual(tf.refRow, 0, 'Reference row index');
-        notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
-        deepEqual(tf.getRowsNb(), 7, 'Filterable rows number');
-    });
-    test('Can perform a search', function() {
-        tf.setFilterValue(2, '<900');
-        tf.filter();
-
-        deepEqual(tf.getValidRows(), [2,3], 'Filtered row');
-    });
-
-    // With no toolbar cannot clear filters :)
-    test('Popup filters with no header', function() {
-        tf.clearFilters();
-        tf.destroy();
-        tf = new TableFilter('demo', 0, {
-            base_path: '../dist/tablefilter/',
-            popup_filters: true
-        });
-        tf.init();
-
-        deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
-        deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
-        deepEqual(tf.refRow, 1, 'Reference row index');
-        notEqual(tf.getFilterElement(0), null, 'Filter element for column 0');
-    });
-
-    test('Can perform a search', function() {
-        tf.setFilterValue(1, 'Melbourne');
-        tf.filter();
-
-        deepEqual(tf.getValidRows(), [4], 'Filtered row');
-    });
-
-    module('Tear-down');
-    test('TableFilter removed', function() {
-        tf.clearFilters();
-        tf.destroy();
-        deepEqual(tf.isInitialized(), false, 'Filters removed');
-    });
-
-})(window, TableFilter);

test/test-popup-filter.js

@@ -72,6 +72,61 @@ test('Pop-up filter state after clearing', function(){
         true, 'Icon state');
 });
 
+test('Can open pop-up filter', function(){
+    // act
+    popupFilter.open(1);
+
+    // assert
+    deepEqual(popupFilter.fltElms[1].style.display, 'block',
+        'Popup filter is open');
+});
+
+test('Can close pop-up filter', function(){
+    // act
+    popupFilter.close(1);
+
+    // assert
+    deepEqual(popupFilter.fltElms[1].style.display, 'none',
+        'Popup filter is open');
+});
+
+test('Can toggle pop-up filter (initially closed)', function(){
+    // setup
+    popupFilter.close(2);
+
+    // act
+    popupFilter.toggle(2);
+
+    // assert
+    deepEqual(popupFilter.fltElms[2].style.display, 'block',
+        'Popup filter is toggled');
+});
+
+test('Can toggle pop-up filter (initially opened)', function(){
+    // setup
+    popupFilter.open(2);
+
+    // act
+    popupFilter.toggle(2);
+
+    // assert
+    deepEqual(popupFilter.fltElms[2].style.display, 'none',
+        'Popup filter is toggled');
+});
+
+test('Can destroy and reset', function(){
+    // setup
+    popupFilter.destroy();
+
+    // act
+    popupFilter.reset();
+
+    // assert
+    deepEqual(popupFilter.fltElms.length, 5, 'Filters are generated');
+    deepEqual(popupFilter.fltIcons.length, 4, 'Icons are generated');
+    deepEqual(popupFilter.fltSpans.length, 4, 'Icon containers are generated');
+});
+
 test('TableFilter removed', function() {
     tf.destroy();
     var fltIcn1 = popupFilter.fltIcons[3];