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

Removed element IDs from Help and RowsCounter

Browse source
This commit is contained in:
Max Guglielmi 2016-11-01 13:58:25 +11:00
parent 85c62a7bff
commit 21305e2e62
14 changed files with 63 additions and 98 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.4.2 - Starter</title>
<title>tablefilter v0.4.3 - Starter</title>
</head>
<body>
<h1>tablefilter v0.4.2</h1>
<h1>tablefilter v0.4.3</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.395Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.751Z
* 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}

16
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.2 by Max Guglielmi
* build date: 2016-10-31T11:11:06.379Z
* tablefilter v0.4.3 by Max Guglielmi
* build date: 2016-11-01T02:53:49.735Z
* MIT License
*/

2
package.json
View file

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

3
src/modules/checkList.js
View file

@ -343,6 +343,7 @@ export class CheckList extends Feature {
* Add checklist options
* @param {Number} colIndex Column index
* @param {Object} ul Ul element
* @private
*/
addChecks(colIndex, ul) {
let tf = this.tf;
@ -377,6 +378,7 @@ export class CheckList extends Feature {
* Add checklist header option
* @param {Number} colIndex Column index
* @param {Object} ul Ul element
* @private
*/
addTChecks(colIndex, ul) {
let tf = this.tf;
@ -415,6 +417,7 @@ export class CheckList extends Feature {
/**
* Store checked options in DOM element attribute
* @param {Object} o checklist option DOM element
* @private
*/
setCheckListValues(o) {
if (!o) {

75
src/modules/help.js
View file

@ -13,13 +13,13 @@ const WEBSITE_URL = 'http://koalyptus.github.io/TableFilter/';
export class Help extends Feature {
/**
* Creates an instance of Help.
* Creates an instance of Help
* @param {TableFilter} tf TableFilter instance
*/
constructor(tf) {
super(tf, 'help');
var f = this.config;
let f = this.config;
/**
* ID of main custom container element
@ -102,20 +102,6 @@ export class Help extends Feature {
'<div align="center" style="margin-top:8px;">' +
'<a href="javascript:void(0);" class="close">Close</a></div></div>';
/**
* Prefix for help main container ID
* @type {String}
* @private
*/
this.prfxHelpSpan = 'helpSpan_';
/**
* Prefix for help instructions container ID
* @type {String}
* @private
*/
this.prfxHelpDiv = 'helpDiv_';
this.emitter.on(['init-help'], () => this.init());
}
@ -127,56 +113,54 @@ export class Help extends Feature {
return;
}
var tf = this.tf;
let tf = this.tf;
var helpspan = createElm('span', ['id', this.prfxHelpSpan + tf.id]);
var helpdiv = createElm('div', ['id', this.prfxHelpDiv + tf.id]);
let btn = createElm('span');
let cont = createElm('div');
//help button is added to defined element
if (!this.tgtId) {
tf.setToolbar();
}
var targetEl = !this.tgtId ? tf.rDiv : elm(this.tgtId);
targetEl.appendChild(helpspan);
let targetEl = !this.tgtId ? tf.rDiv : elm(this.tgtId);
targetEl.appendChild(btn);
var divContainer = !this.contTgtId ? helpspan : elm(this.contTgtId);
let divContainer = !this.contTgtId ? btn : elm(this.contTgtId);
if (!this.btnHtml) {
divContainer.appendChild(helpdiv);
var helplink = createElm('a', ['href', 'javascript:void(0);']);
divContainer.appendChild(cont);
let helplink = createElm('a', ['href', 'javascript:void(0);']);
helplink.className = this.btnCssClass;
helplink.appendChild(createText(this.btnText));
helpspan.appendChild(helplink);
btn.appendChild(helplink);
addEvt(helplink, 'click', () => this.toggle());
} else {
helpspan.innerHTML = this.btnHtml;
var helpEl = helpspan.firstChild;
btn.innerHTML = this.btnHtml;
let helpEl = btn.firstChild;
addEvt(helpEl, 'click', () => this.toggle());
divContainer.appendChild(helpdiv);
divContainer.appendChild(cont);
}
if (!this.instrHtml) {
helpdiv.innerHTML = this.instrText;
helpdiv.className = this.contCssClass;
addEvt(helpdiv, 'dblclick', () => this.toggle());
cont.innerHTML = this.instrText;
cont.className = this.contCssClass;
addEvt(cont, 'dblclick', () => this.toggle());
} else {
if (this.contTgtId) {
divContainer.appendChild(helpdiv);
divContainer.appendChild(cont);
}
helpdiv.innerHTML = this.instrHtml;
cont.innerHTML = this.instrHtml;
if (!this.contTgtId) {
helpdiv.className = this.contCssClass;
addEvt(helpdiv, 'dblclick', () => this.toggle());
cont.className = this.contCssClass;
addEvt(cont, 'dblclick', () => this.toggle());
}
}
helpdiv.innerHTML += this.defaultHtml;
addEvt(helpdiv, 'click', () => this.toggle());
cont.innerHTML += this.defaultHtml;
addEvt(cont, 'click', () => this.toggle());
this.cont = helpdiv;
this.btn = helpspan;
/**
* @inherited
*/
this.cont = cont;
this.btn = btn;
/** @inherited */
this.initialized = true;
}
@ -189,7 +173,7 @@ export class Help extends Feature {
if (this.enabled === false) {
return;
}
var divDisplay = this.cont.style.display;
let divDisplay = this.cont.style.display;
if (divDisplay === '' || divDisplay === NONE) {
this.cont.style.display = 'inline';
} else {
@ -206,11 +190,10 @@ export class Help extends Feature {
}
removeElm(this.btn);
this.btn = null;
if (!this.cont) {
return;
}
removeElm(this.cont);
this.cont = null;
this.initialized = false;
}

31
src/modules/rowsCounter.js
View file

@ -67,27 +67,6 @@ export class RowsCounter extends Feature {
*/
this.cssClass = f.tot_rows_css_class || 'tot';
/**
* Prefix for container ID
* @type {String}
* @private
*/
this.prfxCounter = 'counter_';
/**
* Prefix for DOM element containing the counter
* @type {String}
* @private
*/
this.prfxLabel = 'totrows_span_';
/**
* Prefix for label preceding the counter
* @type {String}
* @private
*/
this.prfxText = 'totRowsTextSpan_';
/**
* Callback fired before the counter is refreshed
* @type {Function}
@ -114,11 +93,11 @@ export class RowsCounter extends Feature {
let tf = this.tf;
//rows counter container
let countDiv = createElm('div', ['id', this.prfxCounter + tf.id]);
let countDiv = createElm('div');
countDiv.className = this.cssClass;
//rows counter label
let countSpan = createElm('span', ['id', this.prfxLabel + tf.id]);
let countText = createElm('span', ['id', this.prfxText + tf.id]);
let countSpan = createElm('span');
let countText = createElm('span');
countText.appendChild(createText(this.text));
// counter is added to defined element
@ -146,9 +125,7 @@ export class RowsCounter extends Feature {
() => this.refresh(tf.getValidRowsNb()));
this.emitter.on(['rows-changed'], () => this.refresh());
/**
* @inherited
*/
/** @inherited */
this.initialized = true;
this.refresh();
}

2
test/test-rows-counter.js
View file

@ -9,6 +9,8 @@ var rowsCounter = tf.feature('rowsCounter');
module('Sanity checks');
test('RowsCounter component', function() {
notEqual(rowsCounter, null, 'RowsCounter instanciated');
notEqual(rowsCounter.container, null, 'RowsCounter container element');
notEqual(rowsCounter.label, null, 'RowsCounter label element');
});
module('Feature interface');