diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index 1f2844ea..15931115 100644 --- a/dist/tablefilter/style/colsVisibility.css +++ b/dist/tablefilter/style/colsVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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 0972742c..15781c64 100644 --- a/dist/tablefilter/style/filtersVisibility.css +++ b/dist/tablefilter/style/filtersVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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 7706b90c..e20d4955 100644 --- a/dist/tablefilter/style/tablefilter.css +++ b/dist/tablefilter/style/tablefilter.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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 2a06f09e..e93cafa0 100644 --- a/dist/tablefilter/style/themes/default/default.css +++ b/dist/tablefilter/style/themes/default/default.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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} \ 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 007ca5da..2c5315c6 100644 --- a/dist/tablefilter/style/themes/mytheme/mytheme.css +++ b/dist/tablefilter/style/themes/mytheme/mytheme.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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} \ 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 d889180e..3a863121 100644 --- a/dist/tablefilter/style/themes/skyblue/skyblue.css +++ b/dist/tablefilter/style/themes/skyblue/skyblue.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.9 by Max Guglielmi - * build date: 2016-04-07T08:41:27.874Z + * build date: 2016-04-07T16:14:40.331Z * 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 1bba35f0..2705f09b 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -7592,8 +7592,7 @@ return /******/ (function(modules) { // webpackBootstrap var cfg = _this.config.state; - // hash enabled by default if state setting is simply set true - _this.enableHash = cfg.types && cfg.types.indexOf('hash') !== -1 || tf.state === true; + _this.enableHash = cfg.types && cfg.types.indexOf('hash') !== -1; _this.enableLocalStorage = cfg.types && cfg.types.indexOf('local_storage') !== -1; _this.enableCookie = cfg.types && cfg.types.indexOf('cookie') !== -1; _this.persistFilters = cfg.filters === false ? false : true; @@ -7973,7 +7972,8 @@ return /******/ (function(modules) { // webpackBootstrap function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } var global = window; - // const JSON = global.JSON; + var JSON = global.JSON; + var localStorage = global.localStorage; var hasStorage = exports.hasStorage = function hasStorage() { return 'Storage' in global; @@ -7984,28 +7984,77 @@ return /******/ (function(modules) { // webpackBootstrap _classCallCheck(this, Storage); this.state = state; + this.tf = state.tf; this.enableLocalStorage = state.enableLocalStorage && hasStorage(); this.enableCookie = state.enableCookie; this.emitter = state.emitter; + + this.prxStorage = 'store'; } Storage.prototype.init = function init() { var _this = this; this.emitter.on(['state-changed'], function (tf, state) { - return _this.update(state); + return _this.save(state); + }); + this.emitter.on(['initialized'], function () { + return _this.sync(); }); - // this.emitter.on(['initialized'], () => this.sync()); }; - Storage.prototype.update = function update(state) { - console.log(this.enableLocalStorage, this.enableCookie, state); - }; - - // save(state){ - + // update(state){ + // console.log(this.enableLocalStorage, this.enableCookie, state); // } + Storage.prototype.save = function save(state) { + if (this.enableLocalStorage) { + localStorage[this.getKey()] = JSON.stringify(state); + } + }; + + Storage.prototype.delete = function _delete() { + if (this.enableLocalStorage) { + localStorage.removeItem(this.getKey()); + } + }; + + Storage.prototype.sync = function sync() { + var state = JSON.parse(localStorage[this.getKey()]); + if (!state) { + return; + } + + // To prevent state to react to features changes, state is temporarily + // disabled + this.state.disable(); + // State is overriden with hash state object + this.state.override(state); + // New hash state is applied to features + this.state.sync(); + // State is re-enabled + this.state.enable(); + }; + + Storage.prototype.getKey = function getKey() { + return this.tf.prfxTf + '_' + this.tf.id; + }; + + Storage.prototype.destroy = function destroy() { + var _this2 = this; + + this.emitter.off(['state-changed'], function (tf, state) { + return _this2.save(state); + }); + this.emitter.off(['initialized'], function () { + return _this2.sync(); + }); + + this.delete(); + + this.state = null; + this.emitter = null; + }; return Storage; }(); diff --git a/src/modules/state.js b/src/modules/state.js index 422e536c..5e234469 100644 --- a/src/modules/state.js +++ b/src/modules/state.js @@ -24,9 +24,7 @@ export class State extends Feature { let cfg = this.config.state; - // hash enabled by default if state setting is simply set true - this.enableHash = (cfg.types && cfg.types.indexOf('hash') !== -1) || - tf.state === true; + this.enableHash = cfg.types && cfg.types.indexOf('hash') !== -1; this.enableLocalStorage = cfg.types && cfg.types.indexOf('local_storage') !== -1; this.enableCookie = cfg.types && cfg.types.indexOf('cookie') !== -1; diff --git a/src/modules/storage.js b/src/modules/storage.js index ca2aa24b..32822780 100644 --- a/src/modules/storage.js +++ b/src/modules/storage.js @@ -1,6 +1,7 @@ const global = window; -// const JSON = global.JSON; +const JSON = global.JSON; +const localStorage = global.localStorage; export const hasStorage = () => { return 'Storage' in global; @@ -10,22 +11,64 @@ export class Storage { constructor(state){ this.state = state; + this.tf = state.tf; this.enableLocalStorage = state.enableLocalStorage && hasStorage(); this.enableCookie = state.enableCookie; this.emitter = state.emitter; + + this.prxStorage = 'store'; } init(){ - this.emitter.on(['state-changed'], (tf, state) => this.update(state)); - // this.emitter.on(['initialized'], () => this.sync()); + this.emitter.on(['state-changed'], (tf, state) => this.save(state)); + this.emitter.on(['initialized'], () => this.sync()); } - update(state){ - console.log(this.enableLocalStorage, this.enableCookie, state); - } - - // save(state){ - + // update(state){ + // console.log(this.enableLocalStorage, this.enableCookie, state); // } + + save(state){ + if(this.enableLocalStorage) { + localStorage[this.getKey()] = JSON.stringify(state); + } + } + + delete(){ + if(this.enableLocalStorage) { + localStorage.removeItem(this.getKey()); + } + } + + sync() { + let state = JSON.parse(localStorage[this.getKey()]); + if (!state) { + return; + } + + // To prevent state to react to features changes, state is temporarily + // disabled + this.state.disable(); + // State is overriden with hash state object + this.state.override(state); + // New hash state is applied to features + this.state.sync(); + // State is re-enabled + this.state.enable(); + } + + getKey(){ + return `${this.tf.prfxTf}_${this.tf.id}`; + } + + destroy(){ + this.emitter.off(['state-changed'], (tf, state) => this.save(state)); + this.emitter.off(['initialized'], () => this.sync()); + + this.delete(); + + this.state = null; + this.emitter = null; + } } diff --git a/static/templates/grouped-headers.html b/static/templates/grouped-headers.html index 46d79974..f16a4161 100644 --- a/static/templates/grouped-headers.html +++ b/static/templates/grouped-headers.html @@ -37,7 +37,7 @@ var tfConfig = { base_path: '../dist/tablefilter/', state: { - types: ['local_storage', 'hash'], + types: ['local_storage'/*, 'hash'*/], page_number: true, page_length: true }, @@ -52,7 +52,7 @@ var tfConfig = { ], filters_row_index: 3, headers_row_index: 2, - remember_grid_values: true, + // remember_grid_values: true, highlight_keywords: true, alternate_rows: true, rows_counter: true,