diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index 552bdca1..9418e488 100644 --- a/dist/tablefilter/style/colsVisibility.css +++ b/dist/tablefilter/style/colsVisibility.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 02e24ba6..2efc6533 100644 --- a/dist/tablefilter/style/filtersVisibility.css +++ b/dist/tablefilter/style/filtersVisibility.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 08b621ee..531a38e9 100644 --- a/dist/tablefilter/style/tablefilter.css +++ b/dist/tablefilter/style/tablefilter.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 72fc0783..78954f05 100644 --- a/dist/tablefilter/style/themes/default/default.css +++ b/dist/tablefilter/style/themes/default/default.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 7b2dd28f..2b622efa 100644 --- a/dist/tablefilter/style/themes/mytheme/mytheme.css +++ b/dist/tablefilter/style/themes/mytheme/mytheme.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 bfc55188..054fd790 100644 --- a/dist/tablefilter/style/themes/skyblue/skyblue.css +++ b/dist/tablefilter/style/themes/skyblue/skyblue.css @@ -1,6 +1,6 @@ /** - * tablefilter v0.2.0 by Max Guglielmi - * build date: 2016-03-19T11:33:23.153Z + * tablefilter v0.2.1 by Max Guglielmi + * build date: 2016-03-20T02:48:14.744Z * 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 6d94825a..5aecc416 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -207,7 +207,7 @@ return /******/ (function(modules) { // webpackBootstrap } this.id = null; - this.version = '0.2.0'; + this.version = '0.2.1'; this.year = new Date().getFullYear(); this.tbl = null; this.startRow = null; @@ -7756,7 +7756,7 @@ return /******/ (function(modules) { // webpackBootstrap var cfg = _this.config.state; - _this.enableHash = cfg.type.indexOf('hash') !== -1; + _this.enableHash = cfg.type && cfg.type.indexOf('hash') !== -1; _this.persistFilters = cfg.filters === false ? false : true; _this.persistPageNumber = Boolean(cfg.page_number); _this.persistPageLength = Boolean(cfg.page_length); @@ -7768,7 +7768,7 @@ return /******/ (function(modules) { // webpackBootstrap _this.state = {}; _this.prfxCol = 'col_'; _this.pageNbKey = 'page'; - _this.pageLengthKey = 'results'; + _this.pageLengthKey = 'page_length'; return _this; } @@ -7802,6 +7802,9 @@ return /******/ (function(modules) { // webpackBootstrap value: function update() { var _this3 = this; + if (!this.isEnabled()) { + return; + } var tf = this.tf; if (this.persistFilters) { @@ -7836,6 +7839,7 @@ return /******/ (function(modules) { // webpackBootstrap this.state[this.pageLengthKey] = this.pageLength; } } + this.emitter.emit('state-changed', tf, this.state); } }, { @@ -7850,6 +7854,11 @@ return /******/ (function(modules) { // webpackBootstrap this.pageLength = pageLength; this.update(); } + }, { + key: 'override', + value: function override(state) { + this.state = state; + } }, { key: 'sync', value: function sync() { @@ -7873,6 +7882,7 @@ return /******/ (function(modules) { // webpackBootstrap if (this.persistPageNumber) { var pageNumber = state[this.pageNbKey]; + console.log('pageNumber', pageNumber); this.emitter.emit('change-page', this.tf, pageNumber); } @@ -7880,6 +7890,8 @@ return /******/ (function(modules) { // webpackBootstrap var pageLength = state[this.pageLengthKey]; this.emitter.emit('change-page-results', this.tf, pageLength); } + + this.emitter.emit('state-synced', tf, this.state); } }, { key: 'destroy', @@ -7921,10 +7933,9 @@ return /******/ (function(modules) { // webpackBootstrap Object.defineProperty(exports, "__esModule", { value: true }); - exports.Hash = undefined; - - var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); // import Str from '../string'; + exports.Hash = exports.hasHashChange = undefined; + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); var _event = __webpack_require__(1); @@ -7934,12 +7945,11 @@ return /******/ (function(modules) { // webpackBootstrap function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - // import Types from '../types'; - var global = window; var JSON = global.JSON; var location = global.location; - var hasHashChange = function hasHashChange() { + + var hasHashChange = exports.hasHashChange = function hasHashChange() { var docMode = global.documentMode; return 'onhashchange' in global && (docMode === undefined || docMode > 7); }; @@ -7949,7 +7959,7 @@ return /******/ (function(modules) { // webpackBootstrap _classCallCheck(this, Hash); this.state = state; - this.lastHash = location.hash; + this.lastHash = null; this.emitter = state.emitter; } @@ -7961,6 +7971,9 @@ return /******/ (function(modules) { // webpackBootstrap if (!hasHashChange()) { return; } + + this.lastHash = location.hash; + this.emitter.on(['state-changed'], function (tf, state) { return _this.update(state); }); @@ -7995,25 +8008,32 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'sync', value: function sync() { - var hash = this.parse(location.hash); - if (!hash) { + var state = this.parse(location.hash); + if (!state) { return; } - this.state.state = hash; + + this.state.disable(); + this.state.override(state); this.state.sync(); + this.state.enable(); } }, { key: 'destroy', value: function destroy() { var _this2 = this; + this.state = null; + this.lastHash = null; + this.emitter = null; + this.emitter.off(['state-changed'], function (tf, state) { return _this2.update(state); }); this.emitter.off(['initialized'], function () { return _this2.sync(); }); - _event2.default.aremove(global, 'hashchange', function () { + _event2.default.remove(global, 'hashchange', function () { return _this2.sync(); }); } diff --git a/package.json b/package.json index fe811b3f..605423c9 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "babel-eslint": "5.0.0", "babel-loader": "^6.0.1", "babel-preset-es2015": "^6.5.0", + "babel-plugin-transform-es2015-classes": "^6.6.5", "clean-webpack-plugin": "^0.1.3", "estraverse": "4.2.0", "estraverse-fb": "1.3.1", diff --git a/src/modules/hash.js b/src/modules/hash.js index 22f85b88..2a278504 100644 --- a/src/modules/hash.js +++ b/src/modules/hash.js @@ -3,7 +3,8 @@ import Event from '../event'; const global = window; const JSON = global.JSON; const location = global.location; -const hasHashChange = () => { + +export const hasHashChange = () => { var docMode = global.documentMode; return ('onhashchange' in global) && (docMode === undefined || docMode > 7); }; @@ -12,7 +13,7 @@ export class Hash { constructor(state){ this.state = state; - this.lastHash = location.hash; + this.lastHash = null; this.emitter = state.emitter; } @@ -20,6 +21,9 @@ export class Hash { if(!hasHashChange()){ return; } + + this.lastHash = location.hash; + this.emitter.on(['state-changed'], (tf, state) => this.update(state)); this.emitter.on(['initialized'], () => this.sync()); Event.add(global, 'hashchange', () => this.sync()); @@ -45,17 +49,24 @@ export class Hash { } sync(){ - let hash = this.parse(location.hash); - if(!hash){ + let state = this.parse(location.hash); + if(!state){ return; } - this.state.state = hash; + + this.state.disable(); + this.state.override(state); this.state.sync(); + this.state.enable(); } destroy() { + this.state = null; + this.lastHash = null; + this.emitter = null; + this.emitter.off(['state-changed'], (tf, state) => this.update(state)); this.emitter.off(['initialized'], () => this.sync()); - Event.aremove(global, 'hashchange', () => this.sync()); + Event.remove(global, 'hashchange', () => this.sync()); } } diff --git a/src/modules/state.js b/src/modules/state.js index ef74d812..7bde5671 100644 --- a/src/modules/state.js +++ b/src/modules/state.js @@ -15,7 +15,7 @@ export class State extends Feature { let cfg = this.config.state; - this.enableHash = cfg.type.indexOf('hash') !== -1; + this.enableHash = cfg.type && cfg.type.indexOf('hash') !== -1; this.persistFilters = cfg.filters === false ? false : true; this.persistPageNumber = Boolean(cfg.page_number); this.persistPageLength = Boolean(cfg.page_length); @@ -27,7 +27,7 @@ export class State extends Feature { this.state = {}; this.prfxCol = 'col_'; this.pageNbKey = 'page'; - this.pageLengthKey = 'results'; + this.pageLengthKey = 'page_length'; } init() { @@ -49,6 +49,9 @@ export class State extends Feature { } update() { + if(!this.isEnabled()){ + return; + } let tf = this.tf; if (this.persistFilters) { @@ -84,6 +87,7 @@ export class State extends Feature { this.state[this.pageLengthKey] = this.pageLength; } } + this.emitter.emit('state-changed', tf, this.state); } @@ -97,6 +101,10 @@ export class State extends Feature { this.update(); } + override(state){ + this.state = state; + } + sync() { let state = this.state; console.log('sync', state); @@ -116,6 +124,7 @@ export class State extends Feature { if (this.persistPageNumber) { let pageNumber = state[this.pageNbKey]; + console.log('pageNumber',pageNumber); this.emitter.emit('change-page', this.tf, pageNumber); } @@ -123,6 +132,8 @@ export class State extends Feature { let pageLength = state[this.pageLengthKey]; this.emitter.emit('change-page-results', this.tf, pageLength); } + + this.emitter.emit('state-synced', tf, this.state); } destroy() { diff --git a/webpack.config.js b/webpack.config.js index 5f286bfd..18dc4a20 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -30,7 +30,8 @@ module.exports = { exclude: /tablefilter\/node_modules/, query: { compact: false, - presets: ['es2015'] + presets: ['es2015'], + plugins: [['transform-es2015-classes', {loose: true}]] }, loader: 'babel-loader' },