mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-19 14:56:40 +02:00
Added emitter class, started implementing pub-sub pattern (rowsCounter)
This commit is contained in:
parent
488c5f3aa8
commit
4fcfaf1ec7
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.0.21 - Starter</title>
|
||||
<title>tablefilter v0.1.0 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.0.21</h1>
|
||||
<h1>tablefilter v0.1.0</h1>
|
||||
|
||||
|
||||
|
||||
|
|
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* 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}
|
4
dist/tablefilter/style/filtersVisibility.css
vendored
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* 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}
|
4
dist/tablefilter/style/tablefilter.css
vendored
4
dist/tablefilter/style/tablefilter.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px solid #ccc !important;border-top:none !important;border-right:none !important;border-bottom:none !important;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important;color:#333 !important}table.TF td{border-bottom:1px dotted #999 !important;padding:5px !important}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px dotted #81963b !important;border-top:none !important;border-right:0 !important;border-bottom:none !important;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;color:#fff !important}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px !important}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.0.21 by Max Guglielmi
|
||||
* build date: 2015-12-27T03:29:01.000Z
|
||||
* tablefilter v0.1.0 by Max Guglielmi
|
||||
* build date: 2015-12-27T10:57:19.453Z
|
||||
* 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}
|
12
dist/tablefilter/tablefilter.js
vendored
12
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
8
dist/tablefilter/tf-1.js
vendored
8
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.0.21",
|
||||
"version": "0.1.0",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
@ -24,6 +24,9 @@
|
|||
"scripts": {
|
||||
"test": "grunt test"
|
||||
},
|
||||
"publishConfig": {
|
||||
"tag": "next"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-core": "^6.1.2",
|
||||
"babel-loader": "^6.0.1",
|
||||
|
|
27
src/emitter.js
Normal file
27
src/emitter.js
Normal file
|
@ -0,0 +1,27 @@
|
|||
export class Emitter {
|
||||
constructor() {
|
||||
this.events = {};
|
||||
}
|
||||
|
||||
on(evt, fn) {
|
||||
this.events[evt] = this.events[evt] || [];
|
||||
this.events[evt].push(fn);
|
||||
}
|
||||
|
||||
off(evt, fn) {
|
||||
if(evt in this.events === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.events[evt].splice(this.events[evt].indexOf(fn), 1);
|
||||
}
|
||||
|
||||
emit(evt /*, args...*/) {
|
||||
if(evt in this.events === false) {
|
||||
return;
|
||||
}
|
||||
for(var i = 0; i < this.events[evt].length; i++) {
|
||||
this.events[evt][i].apply(this, [].slice.call(arguments, 1));
|
||||
}
|
||||
}
|
||||
}
|
|
@ -293,7 +293,8 @@ export default class AdapterEzEditTable {
|
|||
cfg.on_added_dom_row = function(){
|
||||
tf.nbFilterableRows++;
|
||||
if(!tf.paging){
|
||||
tf.feature('rowsCounter').refresh();
|
||||
tf.emitter.emit('rows-changed', tf, this);
|
||||
//tf.feature('rowsCounter').refresh();
|
||||
} else {
|
||||
tf.nbRows++;
|
||||
tf.nbVisibleRows++;
|
||||
|
@ -314,7 +315,8 @@ export default class AdapterEzEditTable {
|
|||
cfg.actions['delete'].on_after_submit = function(){
|
||||
tf.nbFilterableRows--;
|
||||
if(!tf.paging){
|
||||
tf.feature('rowsCounter').refresh();
|
||||
// tf.feature('rowsCounter').refresh();
|
||||
tf.emitter.emit('rows-changed', tf, this);
|
||||
} else {
|
||||
tf.nbRows--;
|
||||
tf.nbVisibleRows--;
|
||||
|
|
|
@ -7,6 +7,7 @@ export class Feature {
|
|||
this.feature = feature;
|
||||
this.enabled = tf[feature];
|
||||
this.config = tf.config();
|
||||
this.emitter = tf.emitter;
|
||||
this.initialized = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -451,6 +451,9 @@ export class Paging extends Feature{
|
|||
tf.nbVisibleRows = tf.validRowsIndex.length;
|
||||
//re-applies filter behaviours after filtering process
|
||||
tf.applyProps();
|
||||
|
||||
// broadcast grouping by page
|
||||
this.emitter.emit('grouped-by-page', tf, this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -76,6 +76,13 @@ export class RowsCounter extends Feature{
|
|||
this.rowsCounterDiv = countDiv;
|
||||
this.rowsCounterSpan = countSpan;
|
||||
|
||||
// subscribe to after-filtering event
|
||||
this.emitter.on('after-filtering', ()=> this.refresh(tf.nbVisibleRows));
|
||||
// subscribe to grouped-by-page event
|
||||
this.emitter.on('grouped-by-page', ()=> this.refresh(tf.nbVisibleRows));
|
||||
// subscribe to rows-changed event
|
||||
this.emitter.on('rows-changed', ()=> this.refresh());
|
||||
|
||||
this.initialized = true;
|
||||
this.refresh();
|
||||
}
|
||||
|
@ -132,6 +139,18 @@ export class RowsCounter extends Feature{
|
|||
}
|
||||
this.rowsCounterSpan = null;
|
||||
this.rowsCounterDiv = null;
|
||||
|
||||
// unsubscribe to events
|
||||
this.emitter.off(
|
||||
'after-filtering',
|
||||
()=> this.refresh(tf.nbVisibleRows)
|
||||
);
|
||||
this.emitter.off(
|
||||
'grouped-by-page',
|
||||
()=> this.refresh(tf.nbVisibleRows)
|
||||
);
|
||||
this.emitter.off('rows-changed', ()=> this.refresh());
|
||||
|
||||
this.initialized = false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ import Types from './types';
|
|||
import Arr from './array';
|
||||
import DateHelper from './date';
|
||||
import Helpers from './helpers';
|
||||
import {Emitter} from './emitter';
|
||||
|
||||
// Features
|
||||
import {Store} from './modules/store';
|
||||
|
@ -26,7 +27,7 @@ import {NoResults} from './modules/noResults';
|
|||
let global = window,
|
||||
doc = global.document;
|
||||
|
||||
export class TableFilter{
|
||||
export class TableFilter {
|
||||
|
||||
/**
|
||||
* TableFilter object constructor
|
||||
|
@ -54,6 +55,7 @@ export class TableFilter{
|
|||
|
||||
// TODO: use for-of with babel plug-in
|
||||
args.forEach((arg)=> {
|
||||
// for (let arg of args) {
|
||||
let argtype = typeof arg;
|
||||
if(argtype === 'object' && arg && arg.nodeName === 'TABLE'){
|
||||
this.tbl = arg;
|
||||
|
@ -66,6 +68,7 @@ export class TableFilter{
|
|||
} else if(argtype === 'object'){
|
||||
this.cfg = arg;
|
||||
}
|
||||
// }
|
||||
});
|
||||
|
||||
if(!this.tbl || this.tbl.nodeName != 'TABLE' || this.getRowsNb() === 0){
|
||||
|
@ -76,6 +79,8 @@ export class TableFilter{
|
|||
// configuration object
|
||||
let f = this.cfg;
|
||||
|
||||
this.emitter = new Emitter();
|
||||
|
||||
//Start row et cols nb
|
||||
this.refRow = this.startRow === null ? 2 : (this.startRow+1);
|
||||
try{ this.nbCells = this.getCellsNb(this.refRow); }
|
||||
|
@ -935,6 +940,8 @@ export class TableFilter{
|
|||
if(this.onFiltersLoaded){
|
||||
this.onFiltersLoaded.call(null, this);
|
||||
}
|
||||
|
||||
this.emitter.emit('initialized', this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1492,6 +1499,7 @@ export class TableFilter{
|
|||
if(this.onBeforeFilter){
|
||||
this.onBeforeFilter.call(null, this);
|
||||
}
|
||||
this.emitter.emit('before-filtering', this);
|
||||
|
||||
let row = this.tbl.rows,
|
||||
Mod = this.Mod,
|
||||
|
@ -1857,7 +1865,9 @@ export class TableFilter{
|
|||
if(this.rememberGridValues){
|
||||
Mod.store.saveFilterValues(this.fltsValuesCookie);
|
||||
}
|
||||
|
||||
//applies filter props after filtering process
|
||||
// TODO remove below if statement when custom events in place
|
||||
if(!this.paging){
|
||||
this.applyProps();
|
||||
} else {
|
||||
|
@ -1867,10 +1877,11 @@ export class TableFilter{
|
|||
Mod.paging.currentPageNb = 1;
|
||||
Mod.paging.setPagingInfo(this.validRowsIndex);
|
||||
}
|
||||
//invokes onafter callback
|
||||
//invokes onafterfilter callback
|
||||
if(this.onAfterFilter){
|
||||
this.onAfterFilter.call(null,this);
|
||||
this.onAfterFilter.call(null, this);
|
||||
}
|
||||
this.emitter.emit('after-filtering', this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1895,9 +1906,9 @@ export class TableFilter{
|
|||
this.linkFilters();
|
||||
}
|
||||
|
||||
if(this.rowsCounter){
|
||||
Mod.rowsCounter.refresh(this.nbVisibleRows);
|
||||
}
|
||||
// if(this.rowsCounter){
|
||||
// Mod.rowsCounter.refresh(this.nbVisibleRows);
|
||||
// }
|
||||
|
||||
if(this.popupFilters){
|
||||
Mod.popupFilter.closeAll();
|
||||
|
|
Loading…
Reference in a new issue