diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index 15931115..f751898e 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 15781c64..c778cb89 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 e20d4955..f3787a99 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 e93cafa0..8bea8028 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 2c5315c6..78b61ed3 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 3a863121..8564d2b4 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-07T16:14:40.331Z + * build date: 2016-04-08T13:48:40.039Z * 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 4efead75..63272eec 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -7592,9 +7592,9 @@ return /******/ (function(modules) { // webpackBootstrap var cfg = _this.config.state; - _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.enableHash = cfg === true || _types2.default.isObj(cfg.types) && cfg.types.indexOf('hash') !== -1; + _this.enableLocalStorage = _types2.default.isObj(cfg.types) && cfg.types.indexOf('local_storage') !== -1; + _this.enableCookie = _types2.default.isObj(cfg.types) && cfg.types.indexOf('cookie') !== -1; _this.persistFilters = cfg.filters === false ? false : true; _this.persistPageNumber = Boolean(cfg.page_number); _this.persistPageLength = Boolean(cfg.page_length); @@ -7762,6 +7762,25 @@ return /******/ (function(modules) { // webpackBootstrap } }; + /** + * Override current state with passed one and sync features + * + * @param state State object + */ + + + State.prototype.overrideAndSync = function overrideAndSync(state) { + // To prevent state to react to features changes, state is temporarily + // disabled + this.disable(); + // State is overriden with passed state object + this.override(state); + // New hash state is applied to features + this.sync(); + // State is re-enabled + this.enable(); + }; + /** * Destroy State instance */ @@ -7922,20 +7941,12 @@ return /******/ (function(modules) { // webpackBootstrap 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(); + // override current state with persisted one and sync features + this.state.overrideAndSync(state); }; /** - * Destroy Hash instance + * Release Hash event subscriptions and clear fields */ @@ -7982,12 +7993,27 @@ return /******/ (function(modules) { // webpackBootstrap var global = window; var JSON = global.JSON; var localStorage = global.localStorage; + var location = global.location; var hasStorage = exports.hasStorage = function hasStorage() { return 'Storage' in global; }; + /** + * Stores the features state in browser's local storage or cookie + * + * @export + * @class Storage + */ + var Storage = exports.Storage = function () { + + /** + * Creates an instance of Storage + * + * @param {State} state Instance of State + */ + function Storage(state) { _classCallCheck(this, Storage); @@ -7999,6 +8025,11 @@ return /******/ (function(modules) { // webpackBootstrap this.duration = state.cookieDuration; } + /** + * Initializes the Storage object + */ + + Storage.prototype.init = function init() { var _this = this; @@ -8010,6 +8041,13 @@ return /******/ (function(modules) { // webpackBootstrap }); }; + /** + * Persists the features state on state changes + * + * @param {State} state Instance of State + */ + + Storage.prototype.save = function save(state) { if (this.enableLocalStorage) { localStorage[this.getKey()] = JSON.stringify(state); @@ -8018,7 +8056,14 @@ return /******/ (function(modules) { // webpackBootstrap } }; - Storage.prototype.parse = function parse() { + /** + * Turns stored string into a State JSON object + * + * @returns {Object} JSON object + */ + + + Storage.prototype.retrieve = function retrieve() { var state = null; if (this.enableLocalStorage) { state = localStorage[this.getKey()]; @@ -8032,6 +8077,11 @@ return /******/ (function(modules) { // webpackBootstrap return JSON.parse(state); }; + /** + * Removes persisted state from storage + */ + + Storage.prototype.remove = function remove() { if (this.enableLocalStorage) { localStorage.removeItem(this.getKey()); @@ -8040,27 +8090,39 @@ return /******/ (function(modules) { // webpackBootstrap } }; + /** + * Applies persisted state to features + */ + + Storage.prototype.sync = function sync() { - var state = this.parse(); + var state = this.retrieve(); 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(); + // override current state with persisted one and sync features + this.state.overrideAndSync(state); }; + /** + * Returns the storage key + * + * @returns {String} Key + */ + + Storage.prototype.getKey = function getKey() { - return this.tf.prfxTf + '_' + this.tf.id; + return JSON.stringify({ + key: this.tf.prfxTf + '_' + this.tf.id, + path: location.pathname + }); }; + /** + * Release Storage event subscriptions and clear fields + */ + + Storage.prototype.destroy = function destroy() { var _this2 = this; diff --git a/src/modules/hash.js b/src/modules/hash.js index 89983ba6..bf0783f2 100644 --- a/src/modules/hash.js +++ b/src/modules/hash.js @@ -81,20 +81,12 @@ export class Hash { 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(); + // override current state with persisted one and sync features + this.state.overrideAndSync(state); } /** - * Destroy Hash instance + * Release Hash event subscriptions and clear fields */ destroy() { this.emitter.off(['state-changed'], (tf, state) => this.update(state)); diff --git a/src/modules/state.js b/src/modules/state.js index 62f9ebd4..1aad4452 100644 --- a/src/modules/state.js +++ b/src/modules/state.js @@ -24,10 +24,12 @@ export class State extends Feature { let cfg = this.config.state; - this.enableHash = cfg.types && cfg.types.indexOf('hash') !== -1; - this.enableLocalStorage = cfg.types && + this.enableHash = cfg === true || + (Types.isObj(cfg.types) && cfg.types.indexOf('hash') !== -1); + this.enableLocalStorage = Types.isObj(cfg.types) && cfg.types.indexOf('local_storage') !== -1; - this.enableCookie = cfg.types && cfg.types.indexOf('cookie') !== -1; + this.enableCookie = Types.isObj(cfg.types) && + cfg.types.indexOf('cookie') !== -1; this.persistFilters = cfg.filters === false ? false : true; this.persistPageNumber = Boolean(cfg.page_number); this.persistPageLength = Boolean(cfg.page_length); @@ -175,6 +177,23 @@ export class State extends Feature { } } + /** + * Override current state with passed one and sync features + * + * @param state State object + */ + overrideAndSync(state) { + // To prevent state to react to features changes, state is temporarily + // disabled + this.disable(); + // State is overriden with passed state object + this.override(state); + // New hash state is applied to features + this.sync(); + // State is re-enabled + this.enable(); + } + /** * Destroy State instance */ diff --git a/src/modules/storage.js b/src/modules/storage.js index 49973c8a..0a2f4189 100644 --- a/src/modules/storage.js +++ b/src/modules/storage.js @@ -4,14 +4,26 @@ import Cookie from '../cookie'; const global = window; const JSON = global.JSON; const localStorage = global.localStorage; +const location = global.location; export const hasStorage = () => { return 'Storage' in global; }; +/** + * Stores the features state in browser's local storage or cookie + * + * @export + * @class Storage + */ export class Storage { - constructor(state){ + /** + * Creates an instance of Storage + * + * @param {State} state Instance of State + */ + constructor(state) { this.state = state; this.tf = state.tf; this.enableLocalStorage = state.enableLocalStorage && hasStorage(); @@ -21,63 +33,85 @@ export class Storage { } - init(){ + /** + * Initializes the Storage object + */ + init() { this.emitter.on(['state-changed'], (tf, state) => this.save(state)); this.emitter.on(['initialized'], () => this.sync()); } - save(state){ - if(this.enableLocalStorage) { + /** + * Persists the features state on state changes + * + * @param {State} state Instance of State + */ + save(state) { + if (this.enableLocalStorage) { localStorage[this.getKey()] = JSON.stringify(state); } else { Cookie.write(this.getKey(), JSON.stringify(state), this.duration); } } - parse(){ + /** + * Turns stored string into a State JSON object + * + * @returns {Object} JSON object + */ + retrieve() { let state = null; - if(this.enableLocalStorage) { + if (this.enableLocalStorage) { state = localStorage[this.getKey()]; } else { state = Cookie.read(this.getKey()); } - if(!state){ + if (!state) { return null; } return JSON.parse(state); } - remove(){ - if(this.enableLocalStorage) { + /** + * Removes persisted state from storage + */ + remove() { + if (this.enableLocalStorage) { localStorage.removeItem(this.getKey()); } else { Cookie.remove(this.getKey()); } } + /** + * Applies persisted state to features + */ sync() { - let state = this.parse(); + let state = this.retrieve(); 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(); + // override current state with persisted one and sync features + this.state.overrideAndSync(state); } - getKey(){ - return `${this.tf.prfxTf}_${this.tf.id}`; + /** + * Returns the storage key + * + * @returns {String} Key + */ + getKey() { + return JSON.stringify({ + key: `${this.tf.prfxTf}_${this.tf.id}`, + path: location.pathname + }); } - destroy(){ + /** + * Release Storage event subscriptions and clear fields + */ + destroy() { this.emitter.off(['state-changed'], (tf, state) => this.save(state)); this.emitter.off(['initialized'], () => this.sync()); diff --git a/static/templates/grouped-headers.html b/static/templates/grouped-headers.html index 5951c878..0374bb17 100644 --- a/static/templates/grouped-headers.html +++ b/static/templates/grouped-headers.html @@ -36,11 +36,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FromDestinationRoad Distance (km)By Air (hrs)By Rail (hrs)
SydneyAdelaide14121.425.3
SydneyBrisbane9821.516
SydneyCanberra286.64.3
SydneyMelbourne8721.110.5
AdelaidePerth27813.138
AdelaideAlice Springs1533220.25
AdelaideBrisbane20452.1540
+ + + + +
+
+ + diff --git a/test/test-storage-cookie.js b/test/test-storage-cookie.js new file mode 100644 index 00000000..8396b85b --- /dev/null +++ b/test/test-storage-cookie.js @@ -0,0 +1,81 @@ + +var tf = new TableFilter('demo', { + base_path: '../dist/tablefilter/', + state: { + types: ['cookie'], + filters: true, + page_number: true, + page_length: true + }, + paging: true, + results_per_page: ['Records: ', [2, 4, 6]], +}); +tf.init(); +var state = tf.feature('state'); +var storage = state.storage; + +module('Sanity checks'); +test('State instance', function() { + deepEqual(typeof storage, 'object', 'Storage is instantiated'); + deepEqual(storage.enableCookie, true, 'Cookies enabled'); + deepEqual(storage.enableLocalStorage, false, 'Local storage disabled'); + deepEqual(storage.state, state, 'State instance'); + deepEqual(storage.emitter, state.emitter, 'Emitter instance'); +}); + +module('Behaviour'); +test('Can save and retrieve state', function() { + // setup + var stateObj = { + 'page': 2, + 'page_length': 4, + 'col_2': {'flt': '>500'} + }; + + // act + state.emitter.emit('state-changed', tf, stateObj); + + // assert + deepEqual(storage.retrieve(), stateObj, 'State saved'); +}); + +test('Can sync state', function() { + // setup + storage.save({'page':2,'page_length':4,'col_2':{'flt':'>500'}}); + + // act + storage.sync(); + + // assert + deepEqual(tf.getValidRows(), [2,3,5,6,7,8], 'Table filters are synced'); +}); + +test('Can remove state', function() { + // setup + storage.save({'page':2,'page_length':4,'col_2':{'flt':'>500'}}); + + // act + storage.remove(); + + // assert + deepEqual(storage.retrieve(), null, 'State removed from storage'); +}); + +test('Can get storage key', function() { + // assert + deepEqual(storage.getKey(), + '{"key":"TF_demo","path":"/test/test-storage-cookie.html"}', + 'Storage key returned' + ); +}); + +module('Tear-down'); +test('Can destroy', function() { + // act + storage.destroy(); + + // assert + deepEqual(storage.state, null, 'State instance is null'); + deepEqual(storage.emitter, null, 'Emitter instance is null'); + deepEqual(storage.retrieve(), null, 'Persisted state cleared'); +}); diff --git a/test/test-storage-local.html b/test/test-storage-local.html new file mode 100644 index 00000000..f59154d2 --- /dev/null +++ b/test/test-storage-local.html @@ -0,0 +1,78 @@ + + + + + TableFilter local storage persistence + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FromDestinationRoad Distance (km)By Air (hrs)By Rail (hrs)
SydneyAdelaide14121.425.3
SydneyBrisbane9821.516
SydneyCanberra286.64.3
SydneyMelbourne8721.110.5
AdelaidePerth27813.138
AdelaideAlice Springs1533220.25
AdelaideBrisbane20452.1540
+ + + + +
+
+ + diff --git a/test/test-storage-local.js b/test/test-storage-local.js new file mode 100644 index 00000000..c44969a1 --- /dev/null +++ b/test/test-storage-local.js @@ -0,0 +1,81 @@ + +var tf = new TableFilter('demo', { + base_path: '../dist/tablefilter/', + state: { + types: ['local_storage'], + filters: true, + page_number: true, + page_length: true + }, + paging: true, + results_per_page: ['Records: ', [2, 4, 6]], +}); +tf.init(); +var state = tf.feature('state'); +var storage = state.storage; + +module('Sanity checks'); +test('State instance', function() { + deepEqual(typeof storage, 'object', 'Storage is instantiated'); + deepEqual(storage.enableLocalStorage, true, 'Local storage enabled'); + deepEqual(storage.enableCookie, false, 'Cookies disabled'); + deepEqual(storage.state, state, 'State instance'); + deepEqual(storage.emitter, state.emitter, 'Emitter instance'); +}); + +module('Behaviour'); +test('Can save and retrieve state', function() { + // setup + var stateObj = { + 'page': 2, + 'page_length': 4, + 'col_2': {'flt': '>500'} + }; + + // act + state.emitter.emit('state-changed', tf, stateObj); + + // assert + deepEqual(storage.retrieve(), stateObj, 'State saved'); +}); + +test('Can sync state', function() { + // setup + storage.save({'page':2,'page_length':4,'col_2':{'flt':'>500'}}); + + // act + storage.sync(); + + // assert + deepEqual(tf.getValidRows(), [2,3,5,6,7,8], 'Table filters are synced'); +}); + +test('Can remove state', function() { + // setup + storage.save({'page':2,'page_length':4,'col_2':{'flt':'>500'}}); + + // act + storage.remove(); + + // assert + deepEqual(storage.retrieve(), null, 'State removed from storage'); +}); + +test('Can get storage key', function() { + // assert + deepEqual(storage.getKey(), + '{"key":"TF_demo","path":"/test/test-storage-local.html"}', + 'Storage key returned' + ); +}); + +module('Tear-down'); +test('Can destroy', function() { + // act + storage.destroy(); + + // assert + deepEqual(storage.state, null, 'State instance is null'); + deepEqual(storage.emitter, null, 'Emitter instance is null'); + deepEqual(storage.retrieve(), null, 'Persisted state cleared'); +});