Browse Source

Renamed long custom event names, added hashchange event

pull/156/head
Max Guglielmi 6 years ago
parent
commit
6334667767
  1. 15
      .editorconfig
  2. 5
      .eslintrc
  3. 1
      .gitignore
  4. 2
      dist/tablefilter/style/colsVisibility.css
  5. 2
      dist/tablefilter/style/filtersVisibility.css
  6. 2
      dist/tablefilter/style/tablefilter.css
  7. 2
      dist/tablefilter/style/themes/default/default.css
  8. 2
      dist/tablefilter/style/themes/mytheme/mytheme.css
  9. 2
      dist/tablefilter/style/themes/skyblue/skyblue.css
  10. 7886
      dist/tablefilter/tablefilter.js
  11. 2281
      dist/tablefilter/tf-1.js
  12. 16
      src/modules/loader.js
  13. 8
      src/modules/paging.js
  14. 80
      src/modules/stateful.js
  15. 16
      src/modules/statusBar.js
  16. 8
      src/modules/store.js

15
.editorconfig

@ -0,0 +1,15 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
# Trailing whitespace is significant in markdown files.
[*.md]
trim_trailing_whitespace = false

5
.eslintrc

@ -17,7 +17,8 @@
"no-trailing-spaces": 2,
"no-multi-spaces": 2,
"array-bracket-spacing": 2,
"new-cap": 2
"new-cap": 2,
"radix": [2, "always"]
},
"ecmaFeatures": {
"modules": true
@ -27,4 +28,4 @@
"browser": true,
"node": false
}
}
}

1
.gitignore

@ -7,3 +7,4 @@ npm-debug.log
*.js.map
.codio
.settings
.vscode

2
dist/tablefilter/style/colsVisibility.css

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* 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}

2
dist/tablefilter/style/filtersVisibility.css

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* 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}

2
dist/tablefilter/style/tablefilter.css

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.0 by Max Guglielmi
* build date: 2016-03-15T05:28:00.528Z
* build date: 2016-03-16T07:04:47.841Z
* 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}

7886
dist/tablefilter/tablefilter.js

File diff suppressed because one or more lines are too long

2281
dist/tablefilter/tf-1.js

File diff suppressed because one or more lines are too long

16
src/modules/loader.js

@ -69,9 +69,9 @@ export class Loader extends Feature{
emitter.on([
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-page-change',
'before-clearing-filters',
'before-changing-results-per-page',
'before-page-length-change',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
@ -81,9 +81,9 @@ export class Loader extends Feature{
emitter.on([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-page-change',
'after-clearing-filters',
'after-changing-results-per-page',
'after-page-length-change',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
@ -130,9 +130,9 @@ export class Loader extends Feature{
emitter.off([
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-page-change',
'before-clearing-filters',
'before-changing-results-per-page',
'before-page-length-change',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
@ -142,9 +142,9 @@ export class Loader extends Feature{
emitter.off([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-page-change',
'after-clearing-filters',
'after-changing-results-per-page',
'after-page-length-change',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',

8
src/modules/paging.js

@ -570,7 +570,7 @@ export class Paging extends Feature{
return;
}
this.emitter.emit('before-changing-page', tf, index);
this.emitter.emit('before-page-change', tf, index);
if(index === null){
index = this.pageSelectorType === tf.fltTypeSlc ?
@ -597,7 +597,7 @@ export class Paging extends Feature{
}
}
this.emitter.emit('after-changing-page', tf, index);
this.emitter.emit('after-page-change', tf, index);
}
/**
@ -611,7 +611,7 @@ export class Paging extends Feature{
return;
}
this.emitter.emit('before-changing-results-per-page', tf);
this.emitter.emit('before-page-length-change', tf);
var slcR = this.resultsPerPageSlc;
var slcIndex = slcR.selectedIndex;
@ -635,7 +635,7 @@ export class Paging extends Feature{
}
}
this.emitter.emit('after-changing-results-per-page', tf, slcIndex);
this.emitter.emit('after-page-length-change', tf, slcIndex);
}
/**

80
src/modules/stateful.js

@ -1,58 +1,66 @@
import {Feature} from './feature';
import Str from '../string';
import Event from '../event';
const global = window;
const JSON = global.JSON;
const location = global.location;
const hasHashChange = ()=> {
const hasHashChange = () => {
var docMode = global.documentMode;
return ('onhashchange' in global) && (docMode === undefined || docMode > 7);
};
export class Stateful extends Feature{
export class Stateful extends Feature {
/**
* Makes features stateful via URL hash
* @param {Object} tf TableFilter instance
*/
constructor(tf){
constructor(tf) {
super(tf, 'stateful');
let cfg = this.config.stateful;
this.persistFilters = cfg.filters === false ? false : true;
this.persistPageNumber = Boolean(cfg.page_number);
this.persistPageLength = Boolean(cfg.page_length);
this.pageNb = null;
this.lastHash = null;
this.state = {};
this.prfxCol = 'col_';
this.prfxPageNb = 'page';
this.pageNbKey = 'page';
this.pageResultsKey = 'results';
}
init(){
if(this.initialized || !hasHashChange()){
init() {
if (this.initialized || !hasHashChange()) {
return;
}
this.emitter.on(['initialized'], ()=> this.sync());
this.emitter.on(['after-filtering'], ()=> this.update());
this.emitter.on(['after-changing-page'], ()=> this.update());
this.emitter.on(['initialized'], () => this.sync());
this.emitter.on([
'after-filtering',
'after-page-change',
'after-page-length-change'
], () => this.update());
Event.add(global, 'hashchange', () => this.sync());
this.initialized = true;
}
format(){
format() {
let tf = this.tf;
if(this.persistFilters){
if (this.persistFilters) {
let filterValues = tf.getFiltersValue();
filterValues.forEach((val, idx)=> {
filterValues.forEach((val, idx) => {
let key = `${this.prfxCol}${idx}`;
if(Str.isEmpty(val)){
if(this.state.hasOwnProperty(key)){
if (Str.isEmpty(val)) {
if (this.state.hasOwnProperty(key)) {
this.state[key] = undefined;
}
} else {
@ -63,16 +71,20 @@ export class Stateful extends Feature{
});
}
if(this.persistPageNumber){
if (this.persistPageNumber) {
let pageNumber = tf.feature('paging').getPage();
this.state[this.prfxPageNb] = pageNumber;
this.state[this.pageNbKey] = pageNumber;
}
if (this.persistPageLength) {
}
return `#${JSON.stringify(this.state)}`;
}
parse(hash){
if(hash.indexOf('#') === 0){
parse(hash) {
if (hash.indexOf('#') === 0) {
hash = hash.substr(1);
} else {
hash = '{}';
@ -80,10 +92,10 @@ export class Stateful extends Feature{
return JSON.parse(hash);
}
update(){
update() {
let hash = this.format();
console.log(hash, this.lastHash, this.lastHash === hash);
if(this.lastHash === hash){
if (this.lastHash === hash) {
return;
}
@ -91,14 +103,14 @@ export class Stateful extends Feature{
this.lastHash = hash;
}
sync(){
sync() {
let state = this.parse(location.hash);
let tf = this.tf;
if(this.persistFilters){
Object.keys(state).forEach((key)=> {
if(key.indexOf(this.prfxCol) !== -1){
let colIdx = parseInt(key.replace(this.prfxCol, ''));
if (this.persistFilters) {
Object.keys(state).forEach((key) => {
if (key.indexOf(this.prfxCol) !== -1) {
let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
let val = state[key].flt;
tf.setFilterValue(colIdx, val);
}
@ -107,19 +119,25 @@ export class Stateful extends Feature{
tf.filter();
}
if(this.persistPageNumber){
let pageNumber = state[this.prfxPageNb];
if (this.persistPageNumber) {
let pageNumber = state[this.pageNbKey];
tf.feature('paging').setPage(pageNumber);
}
}
destroy(){
if(!this.initialized){
destroy() {
if (!this.initialized) {
return;
}
this.emitter.on(['initialized'], ()=> this.sync());
this.emitter.off(['after-filtering'], ()=> this.update());
this.emitter.on(['initialized'], () => this.sync());
this.emitter.off([
'after-filtering',
'after-page-change',
'after-page-length-change'
], () => this.update());
Event.remove(global, 'hashchange', () => this.sync());
this.initialized = false;
}

16
src/modules/statusBar.js

@ -118,11 +118,11 @@ export class StatusBar extends Feature{
emitter.on(['before-filtering'], ()=> this.message(this.msgFilter));
emitter.on(['before-populating-filter'],
()=> this.message(this.msgPopulate));
emitter.on(['before-changing-page'],
emitter.on(['before-page-change'],
()=> this.message(this.msgChangePage));
emitter.on(['before-clearing-filters'], ()=>
this.message(this.msgClear));
emitter.on(['before-changing-results-per-page'],
emitter.on(['before-page-length-change'],
()=> this.message(this.msgChangeResults));
emitter.on(['before-reset-page'], ()=> this.message(this.msgResetPage));
emitter.on(['before-reset-page-length'],
@ -135,9 +135,9 @@ export class StatusBar extends Feature{
emitter.on([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-page-change',
'after-clearing-filters',
'after-changing-results-per-page',
'after-page-length-change',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
@ -188,11 +188,11 @@ export class StatusBar extends Feature{
emitter.off(['before-filtering'], ()=> this.message(this.msgFilter));
emitter.off(['before-populating-filter'],
()=> this.message(this.msgPopulate));
emitter.off(['before-changing-page'],
emitter.off(['before-page-change'],
()=> this.message(this.msgChangePage));
emitter.off(['before-clearing-filters'],
()=> this.message(this.msgClear));
emitter.off(['before-changing-results-per-page'],
emitter.off(['before-page-length-change'],
()=> this.message(this.msgChangeResults));
emitter.off(['before-reset-page'], ()=>
this.message(this.msgResetPage));
@ -206,9 +206,9 @@ export class StatusBar extends Feature{
emitter.off([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-page-change',
'after-clearing-filters',
'after-changing-results-per-page',
'after-page-length-change',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',

8
src/modules/store.js

@ -29,9 +29,9 @@ export class Store{
init(){
this.emitter.on(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.on(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.on(['after-changing-page'],
this.emitter.on(['after-page-change'],
(tf, index)=> this.savePageNb(index));
this.emitter.on(['after-changing-results-per-page'],
this.emitter.on(['after-page-length-change'],
(tf, index)=> this.savePageLength(index));
}
@ -138,9 +138,9 @@ export class Store{
destroy(){
this.emitter.off(['after-filtering'], ()=> this.saveFilterValues());
this.emitter.off(['after-clearing-filters'], ()=> this.clearCookies());
this.emitter.off(['after-changing-page'],
this.emitter.off(['after-page-change'],
(tf, index)=> this.savePageNb(index));
this.emitter.off(['after-changing-results-per-page'],
this.emitter.off(['after-page-length-change'],
(tf, index)=> this.savePageLength(index));
}
}

Loading…
Cancel
Save