deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-17 05:46:39 +02:00
Code Issues Releases Wiki Activity

Started filters visibility persistence

Browse source
This commit is contained in:
Max Guglielmi 2016-04-24 17:12:45 +02:00
parent d33824a508
commit 574a371ba4
13 changed files with 10750 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.2.12 - Starter</title>
<title>tablefilter v0.2.13 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.12</h1>
<h1>tablefilter v0.2.13</h1>

4
dist/tablefilter/style/colsVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

4
dist/tablefilter/style/themes/default/default.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* 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}

4
dist/tablefilter/style/themes/mytheme/mytheme.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* 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}

4
dist/tablefilter/style/themes/skyblue/skyblue.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-20T14:24:50.288Z
* tablefilter v0.2.13 by Max Guglielmi
* build date: 2016-04-24T14:43:07.849Z
* 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}

8382
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2285
dist/tablefilter/tf-1.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.2.12",
"version": "0.2.13",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {

62
src/extensions/filtersVisibility/filtersVisibility.js
View file

@ -2,14 +2,14 @@ import Dom from '../../dom';
import Types from '../../types';
import Event from '../../event';
export default class FiltersVisibility{
export default class FiltersVisibility {
/**
* Filters Row Visibility extension
* @param {Object} tf TableFilter instance
* @param {Object} f Config
*/
constructor(tf, f){
constructor(tf, f) {
this.initialized = false;
this.name = f.name;
@ -25,16 +25,16 @@ export default class FiltersVisibility{
//expand/collapse filters btn element
this.btnEl = null;
this.icnExpandHtml = '<img src="'+ tf.themesPath + this.icnExpand +
this.icnExpandHtml = '<img src="' + tf.themesPath + this.icnExpand +
'" alt="Expand filters" >';
this.icnCollapseHtml = '<img src="'+ tf.themesPath + this.icnCollapse +
this.icnCollapseHtml = '<img src="' + tf.themesPath + this.icnCollapse +
'" alt="Collapse filters" >';
this.defaultText = 'Toggle filters';
//id of container element
this.targetId = f.target_id || null;
//enables/disables expand/collapse icon
this.enableIcon = f.enable_icon===false ? false : true;
this.enableIcon = f.enable_icon === false ? false : true;
this.btnText = f.btn_text || '';
//defines expand/collapse filters text
@ -52,7 +52,7 @@ export default class FiltersVisibility{
//defines css class span containing expand/collapse filters
this.contCssClass = f.cont_css_class || 'expClpFlt';
this.filtersRowIndex = !Types.isUndef(f.filters_row_index) ?
f.filters_row_index : tf.getFiltersRowIndex();
f.filters_row_index : tf.getFiltersRowIndex();
this.visibleAtStart = !Types.isUndef(f.visible_at_start) ?
Boolean(f.visible_at_start) : true;
@ -73,38 +73,42 @@ export default class FiltersVisibility{
this.onAfterHide = Types.isFn(f.on_after_hide) ? f.on_after_hide : null;
//Loads extension stylesheet
tf.import(f.name+'Style', tf.stylePath + this.stylesheet, null, 'link');
tf.import(f.name + 'Style', tf.stylePath + this.stylesheet, null,
'link');
this.tf = tf;
this.emitter = tf.emitter;
}
/**
* Initialise extension
*/
init(){
if(this.initialized){
init() {
if (this.initialized) {
return;
}
this.buildUI();
this.initialized = true;
this.emitter.on(['toggle-filters'], () => this.toggle());
this.emitter.emit('filters-visibility-initialized', tf, this);
}
/**
* Build UI elements
*/
buildUI(){
buildUI() {
let tf = this.tf;
let span = Dom.create('span',['id', this.prfx+tf.id]);
let span = Dom.create('span', ['id', this.prfx + tf.id]);
span.className = this.contCssClass;
//Container element (rdiv or custom element)
if(!this.targetId){
if (!this.targetId) {
tf.setToolbar();
}
let targetEl = !this.targetId ? tf.rDiv : Dom.id(this.targetId);
if(!this.targetId){
if (!this.targetId) {
let firstChild = targetEl.firstChild;
firstChild.parentNode.insertBefore(span, firstChild);
} else {
@ -112,7 +116,7 @@ export default class FiltersVisibility{
}
let btn;
if(!this.btnHtml){
if (!this.btnHtml) {
btn = Dom.create('a', ['href', 'javascript:void(0);']);
btn.className = this.btnCssClass;
btn.title = this.btnText || this.defaultText;
@ -123,12 +127,12 @@ export default class FiltersVisibility{
btn = span.firstChild;
}
Event.add(btn, 'click', ()=> this.toggle());
Event.add(btn, 'click', () => this.toggle());
this.contEl = span;
this.btnEl = btn;
if(!this.visibleAtStart){
if (!this.visibleAtStart) {
this.toggle();
}
}
@ -136,41 +140,45 @@ export default class FiltersVisibility{
/**
* Toggle filters visibility
*/
toggle(){
toggle() {console.log('toggle', arguments);
let tf = this.tf;
let tbl = tf.gridLayout? tf.feature('gridLayout').headTbl : tf.tbl;
let tbl = tf.gridLayout ? tf.feature('gridLayout').headTbl : tf.tbl;
let fltRow = tbl.rows[this.filtersRowIndex];
let fltRowDisplay = fltRow.style.display;
let isDisplayed = fltRowDisplay === '';
if(this.onBeforeShow && fltRowDisplay !== ''){
if (this.onBeforeShow && !isDisplayed) {
this.onBeforeShow.call(this, this);
}
if(this.onBeforeHide && fltRowDisplay === ''){
if (this.onBeforeHide && isDisplayed) {
this.onBeforeHide.call(null, this);
}
fltRow.style.display = fltRowDisplay==='' ? 'none' : '';
if(this.enableIcon && !this.btnHtml){
this.btnEl.innerHTML = fltRowDisplay === '' ?
fltRow.style.display = isDisplayed ? 'none' : '';
if (this.enableIcon && !this.btnHtml) {
this.btnEl.innerHTML = isDisplayed ?
this.expandBtnHtml : this.collapseBtnHtml;
}
if(this.onAfterShow && fltRowDisplay !== ''){
if (this.onAfterShow && !isDisplayed) {
this.onAfterShow.call(null, this);
}
if(this.onAfterHide && fltRowDisplay === ''){
if (this.onAfterHide && isDisplayed) {
this.onAfterHide.call(null, this);
}
this.emitter.emit('filters-toggled', tf, this, !isDisplayed);
}
/**
* Destroy the UI
*/
destroy(){
if(!this.btnEl && !this.contEl){
destroy() {
if (!this.btnEl && !this.contEl) {
return;
}
this.emitter.off(['toggle-filters'], () => this.toggle());
this.btnEl.innerHTML = '';
Dom.remove(this.btnEl);
this.btnEl = null;

42
src/modules/state.js
View file

@ -35,6 +35,7 @@ export class State extends Feature {
this.persistPageLength = Boolean(cfg.page_length);
this.persistSort = Boolean(cfg.sort);
this.persistColsVisibility = Boolean(cfg.columns_visibility);
this.persistFiltersVisibility = Boolean(cfg.filters_visibility);
this.cookieDuration = !isNaN(cfg.cookie_duration) ?
parseInt(cfg.cookie_duration, 10) : 87600;
@ -44,11 +45,13 @@ export class State extends Feature {
this.pageLength = null;
this.sort = null;
this.hiddenCols = null;
this.filtersVisibility = null;
this.state = {};
this.prfxCol = 'col_';
this.pageNbKey = 'page';
this.pageLengthKey = 'page_length';
this.filtersVisKey = 'filters_visibility';
}
/**
@ -71,6 +74,10 @@ export class State extends Feature {
() => this._syncColsVisibility());
this.emitter.on(['column-shown', 'column-hidden'], (tf, feature,
colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols));
this.emitter.on(['filters-visibility-initialized'],
() => this._syncFiltersVisibility());
this.emitter.on(['filters-toggled'],
(tf, extension, visible) => this.updateFiltersVisibility(visible));
if (this.enableHash) {
this.hash = new Hash(this);
@ -159,6 +166,14 @@ export class State extends Feature {
}
}
if (this.persistFiltersVisibility) {
if (Types.isNull(this.filtersVisibility)) {
state[this.filtersVisKey] = undefined;
} else {
state[this.filtersVisKey] = this.filtersVisibility;
}
}
this.emitter.emit('state-changed', tf, state);
}
@ -206,6 +221,12 @@ export class State extends Feature {
this.update();
}
updateFiltersVisibility(visible) {
console.log('updateFiltersVisibility', visible);
this.filtersVisibility = visible;
this.update();
}
/**
* Override state field
*
@ -234,8 +255,14 @@ export class State extends Feature {
this.emitter.emit('change-page-results', tf, pageLength);
}
// if (this.persistFiltersVisibility) { console.log('sync');
// let filtersVisibility = state[this.filtersVisKey];
// this.emitter.emit('toggle-filters', tf, filtersVisibility);
// }
this._syncSort();
this._syncColsVisibility();
this._syncFiltersVisibility();
}
/**
@ -328,6 +355,17 @@ export class State extends Feature {
});
}
_syncFiltersVisibility(){
if (!this.persistFiltersVisibility) {
return;
}
let state = this.state;
let tf = this.tf;
let filtersVisibility = state[this.filtersVisKey];
this.emitter.emit('toggle-filters', tf, filtersVisibility);
}
/**
* Destroy State instance
*/
@ -350,6 +388,10 @@ export class State extends Feature {
() => this._syncColsVisibility());
this.emitter.off(['column-shown', 'column-hidden'], (tf, feature,
colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols));
this.emitter.off(['filters-visibility-initialized'],
() => this._syncFiltersVisibility());
this.emitter.off(['filters-toggled'],
(tf, extension, visible) => this.updateFiltersVisibility(visible));
if (this.enableHash) {
this.hash.destroy();

9
static/templates/filters-visibility.html
View file

@ -30,9 +30,14 @@ var tfConfig = {
btn_reset: true,
loader: true,
status_bar: true,
state: {
types: ['local_storage'],
filters: true,
filters_visibility: true
},
extensions: [{
name: 'filtersVisibility',
visible_at_start: false
name: 'filtersVisibility'/*,
visible_at_start: false*/
}]
};