diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index 1d7ecdc6..74c990e4 100644 --- a/dist/tablefilter/style/colsVisibility.css +++ b/dist/tablefilter/style/colsVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 4916eff5..e949611d 100644 --- a/dist/tablefilter/style/filtersVisibility.css +++ b/dist/tablefilter/style/filtersVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 34f71d8e..26557421 100644 --- a/dist/tablefilter/style/tablefilter.css +++ b/dist/tablefilter/style/tablefilter.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 1ac83aa3..969fa876 100644 --- a/dist/tablefilter/style/themes/default/default.css +++ b/dist/tablefilter/style/themes/default/default.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 4521b6e3..f96c346d 100644 --- a/dist/tablefilter/style/themes/mytheme/mytheme.css +++ b/dist/tablefilter/style/themes/mytheme/mytheme.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 17fd2f88..cdc8ae8b 100644 --- a/dist/tablefilter/style/themes/skyblue/skyblue.css +++ b/dist/tablefilter/style/themes/skyblue/skyblue.css @@ -1,6 +1,6 @@ /** * tablefilter v0.1.6 by Max Guglielmi - * build date: 2016-01-13T03:56:48.756Z + * build date: 2016-01-13T05:45:24.670Z * 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 32402f81..dd46390b 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -676,12 +676,16 @@ return /******/ (function(modules) { // webpackBootstrap } if (this.rememberGridValues || this.rememberPageNb || this.rememberPageLen) { - Mod.store = new _store.Store(this); + if (!Mod.store) { + Mod.store = new _store.Store(this); + } Mod.store.init(); } if (this.gridLayout) { - Mod.gridLayout = new _gridLayout.GridLayout(this); + if (!Mod.gridLayout) { + Mod.gridLayout = new _gridLayout.GridLayout(this); + } Mod.gridLayout.init(); } @@ -708,61 +712,62 @@ return /******/ (function(modules) { // webpackBootstrap if (!this.fltGrid) { this._initNoFilters(); } else { - if (this.isFirstLoad) { - var fltrow = this._insertFiltersRow(); + // if(this.isFirstLoad){ + var fltrow = this._insertFiltersRow(); - this.nbFilterableRows = this.getRowsNb(); - this.nbVisibleRows = this.nbFilterableRows; - this.nbRows = this.tbl.rows.length; + this.nbFilterableRows = this.getRowsNb(); + this.nbVisibleRows = this.nbFilterableRows; + this.nbRows = this.tbl.rows.length; - // Generate filters - for (var i = 0; i < n; i++) { - this.emitter.emit('before-filter-init', this, i); + // Generate filters + for (var i = 0; i < n; i++) { + this.emitter.emit('before-filter-init', this, i); - var fltcell = _dom2.default.create(this.fltCellTag), - col = this.getFilterType(i); + var fltcell = _dom2.default.create(this.fltCellTag), + col = this.getFilterType(i); - if (this.singleSearchFlt) { - fltcell.colSpan = this.nbCells; + if (this.singleSearchFlt) { + fltcell.colSpan = this.nbCells; + } + if (!this.gridLayout) { + fltrow.appendChild(fltcell); + } + inpclass = i == n - 1 && this.displayBtn ? this.fltSmallCssClass : this.fltCssClass; + + //only 1 input for single search + if (this.singleSearchFlt) { + col = this.fltTypeInp; + inpclass = this.singleFltCssClass; + } + + //drop-down filters + if (col === this.fltTypeSlc || col === this.fltTypeMulti) { + if (!Mod.dropdown) { + Mod.dropdown = new _dropdown.Dropdown(this); } - if (!this.gridLayout) { - fltrow.appendChild(fltcell); - } - inpclass = i == n - 1 && this.displayBtn ? this.fltSmallCssClass : this.fltCssClass; - - //only 1 input for single search - if (this.singleSearchFlt) { - col = this.fltTypeInp; - inpclass = this.singleFltCssClass; - } - - //drop-down filters - if (col === this.fltTypeSlc || col === this.fltTypeMulti) { - if (!Mod.dropdown) { - Mod.dropdown = new _dropdown.Dropdown(this); + Mod.dropdown.init(i, this.isExternalFlt, fltcell); + } + // checklist + else if (col === this.fltTypeCheckList) { + if (!Mod.checkList) { + Mod.checkList = new _checkList.CheckList(this); } - Mod.dropdown.init(i, this.isExternalFlt, fltcell); - } - // checklist - else if (col === this.fltTypeCheckList) { - if (!Mod.checkList) { - Mod.checkList = new _checkList.CheckList(this); - } - Mod.checkList.init(i, this.isExternalFlt, fltcell); - } else { - this._buildInputFilter(i, inpclass, fltcell); - } - - // this adds submit button - if (i == n - 1 && this.displayBtn) { - this._buildSubmitButton(i, fltcell); + Mod.checkList.init(i, this.isExternalFlt, fltcell); + } else { + this._buildInputFilter(i, inpclass, fltcell); } - this.emitter.emit('after-filter-init', this, i); - } // for i - } else { - this._resetGrid(); - } //if isFirstLoad + // this adds submit button + if (i == n - 1 && this.displayBtn) { + this._buildSubmitButton(i, fltcell); + } + + this.emitter.emit('after-filter-init', this, i); + } // for i + + // } else { + // this._resetGrid(); + // }//if isFirstLoad } //if this.fltGrid /* Features */ @@ -3652,7 +3657,7 @@ return /******/ (function(modules) { // webpackBootstrap fltValues.push(value); } //adds array size - fltValues.push(tf.fltIds.length); + //fltValues.push(tf.fltIds.length); //writes cookie _cookie2.default.write(name, fltValues.join(tf.separator), this.duration); @@ -3889,7 +3894,7 @@ return /******/ (function(modules) { // webpackBootstrap this.tblMainCont.className = this.gridMainContCssClass; if (this.gridWidth) { this.tblMainCont.style.width = this.gridWidth; - } + }console.log(tbl, tbl.parentNode); tbl.parentNode.insertBefore(this.tblMainCont, tbl); //Table container: div wrapping content table diff --git a/src/modules/gridLayout.js b/src/modules/gridLayout.js index 01b50b67..eb68ca6f 100644 --- a/src/modules/gridLayout.js +++ b/src/modules/gridLayout.js @@ -110,7 +110,7 @@ export class GridLayout extends Feature{ this.tblMainCont.className = this.gridMainContCssClass; if(this.gridWidth){ this.tblMainCont.style.width = this.gridWidth; - } + }console.log(tbl, tbl.parentNode); tbl.parentNode.insertBefore(this.tblMainCont, tbl); //Table container: div wrapping content table diff --git a/src/modules/store.js b/src/modules/store.js index 59ce3b03..5784e81c 100644 --- a/src/modules/store.js +++ b/src/modules/store.js @@ -44,7 +44,7 @@ export class Store{ fltValues.push(value); } //adds array size - fltValues.push(tf.fltIds.length); + //fltValues.push(tf.fltIds.length); //writes cookie Cookie.write( diff --git a/src/tablefilter.js b/src/tablefilter.js index 5e632337..9046f229 100644 --- a/src/tablefilter.js +++ b/src/tablefilter.js @@ -508,12 +508,16 @@ export class TableFilter { if(this.rememberGridValues || this.rememberPageNb || this.rememberPageLen){ - Mod.store = new Store(this); + if(!Mod.store){ + Mod.store = new Store(this); + } Mod.store.init(); } if(this.gridLayout){ - Mod.gridLayout = new GridLayout(this); + if(!Mod.gridLayout){ + Mod.gridLayout = new GridLayout(this); + } Mod.gridLayout.init(); } @@ -540,7 +544,7 @@ export class TableFilter { if(!this.fltGrid){ this._initNoFilters(); } else { - if(this.isFirstLoad){ + // if(this.isFirstLoad){ let fltrow = this._insertFiltersRow(); this.nbFilterableRows = this.getRowsNb(); @@ -594,9 +598,9 @@ export class TableFilter { this.emitter.emit('after-filter-init', this, i); }// for i - } else { - this._resetGrid(); - }//if isFirstLoad + // } else { + // this._resetGrid(); + // }//if isFirstLoad }//if this.fltGrid diff --git a/test/test-grid-layout.js b/test/test-grid-layout.js index 60130168..2195374e 100644 --- a/test/test-grid-layout.js +++ b/test/test-grid-layout.js @@ -19,11 +19,11 @@ test('GridLayout component', function() { deepEqual(tf.filtersRowIndex, 1, 'Filters row index'); }); -test('Destroy GridLayout component', function() { - gridLayout.destroy(); - deepEqual(gridLayout.tblMainCont, null, 'Main container element removed'); - deepEqual(gridLayout.tblCont, null, 'Main HTML table container element removed'); - deepEqual(gridLayout.headTblCont, null, 'Headers container element removed'); - deepEqual(gridLayout.headTbl, null, 'Headers HTML table element removed'); - notEqual(gridLayout.sourceTblHtml, null, 'Table reference is kept'); -}); +// test('Destroy GridLayout component', function() { +// gridLayout.destroy(); +// deepEqual(gridLayout.tblMainCont, null, 'Main container element removed'); +// deepEqual(gridLayout.tblCont, null, 'Main HTML table container element removed'); +// deepEqual(gridLayout.headTblCont, null, 'Headers container element removed'); +// deepEqual(gridLayout.headTbl, null, 'Headers HTML table element removed'); +// notEqual(gridLayout.sourceTblHtml, null, 'Table reference is kept'); +// });