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

Shortened RowsCounter properties names

Browse source
This commit is contained in:
Max Guglielmi 2016-08-06 01:26:53 +10:00
parent 912433a032
commit dc7ffd0321
11 changed files with 49 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* 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 vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* 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 vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* 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 vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* 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 vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.709Z
* build date: 2016-08-05T15:22:39.988Z
* 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}

10
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.50 by Max Guglielmi
* build date: 2016-08-05T10:26:31.694Z
* build date: 2016-08-05T15:22:39.973Z
* MIT License
*/

53
src/modules/rowsCounter.js
View file

@ -24,27 +24,27 @@ export class RowsCounter extends Feature {
* ID of custom container element
* @type {string}
*/
this.rowsCounterTgtId = f.rows_counter_target_id || null;
this.targetId = f.rows_counter_target_id || null;
/**
* Container DOM element
* @type {DOMElement}
* @private
*/
this.rowsCounterDiv = null;
this.container = null;
/**
* Container DOM element for label indicating the total number of rows
* Container DOM element for label displaying the total number of rows
* @type {DOMElement}
* @private
*/
this.rowsCounterSpan = null;
this.label = null;
/**
* Text preceding the total number of rows
* @type {String}
*/
this.rowsCounterText = f.rows_counter_text || 'Rows: ';
this.text = f.rows_counter_text || 'Rows: ';
/**
* Separator symbol appearing between the first and last visible rows of
@ -65,7 +65,7 @@ export class RowsCounter extends Feature {
* Css class for container element
* @type {String}
*/
this.totRowsCssClass = f.tot_rows_css_class || 'tot';
this.cssClass = f.tot_rows_css_class || 'tot';
/**
* Prefix for container ID
@ -79,14 +79,14 @@ export class RowsCounter extends Feature {
* @type {String}
* @private
*/
this.prfxTotRows = 'totrows_span_';
this.prfxLabel = 'totrows_span_';
/**
* Prefix for label preceding the counter
* @type {String}
* @private
*/
this.prfxTotRowsTxt = 'totRowsTextSpan_';
this.prfxText = 'totRowsTextSpan_';
/**
* Callback fired before the counter is refreshed
@ -115,21 +115,20 @@ export class RowsCounter extends Feature {
//rows counter container
let countDiv = createElm('div', ['id', this.prfxCounter + tf.id]);
countDiv.className = this.totRowsCssClass;
countDiv.className = this.cssClass;
//rows counter label
let countSpan = createElm('span', ['id', this.prfxTotRows + tf.id]);
let countText = createElm('span', ['id', this.prfxTotRowsTxt + tf.id]);
countText.appendChild(createText(this.rowsCounterText));
let countSpan = createElm('span', ['id', this.prfxLabel + tf.id]);
let countText = createElm('span', ['id', this.prfxText + tf.id]);
countText.appendChild(createText(this.text));
// counter is added to defined element
if (!this.rowsCounterTgtId) {
if (!this.targetId) {
tf.setToolbar();
}
let targetEl = !this.rowsCounterTgtId ?
tf.lDiv : elm(this.rowsCounterTgtId);
let targetEl = !this.targetId ? tf.lDiv : elm(this.targetId);
//default container: 'lDiv'
if (!this.rowsCounterTgtId) {
if (!this.targetId) {
countDiv.appendChild(countText);
countDiv.appendChild(countSpan);
targetEl.appendChild(countDiv);
@ -139,8 +138,8 @@ export class RowsCounter extends Feature {
targetEl.appendChild(countText);
targetEl.appendChild(countSpan);
}
this.rowsCounterDiv = countDiv;
this.rowsCounterSpan = countSpan;
this.container = countDiv;
this.label = countSpan;
// subscribe to events
this.emitter.on(['after-filtering', 'grouped-by-page'],
@ -154,7 +153,6 @@ export class RowsCounter extends Feature {
this.refresh();
}
/**
* Refreshes the rows counter
* @param {Number} p Optional parameter the total number of rows to display
@ -168,7 +166,7 @@ export class RowsCounter extends Feature {
let tf = this.tf;
if (this.onBeforeRefreshCounter) {
this.onBeforeRefreshCounter.call(null, tf, this.rowsCounterSpan);
this.onBeforeRefreshCounter.call(null, tf, this.label);
}
let totTxt;
@ -194,10 +192,9 @@ export class RowsCounter extends Feature {
}
}
this.rowsCounterSpan.innerHTML = totTxt;
this.label.innerHTML = totTxt;
if (this.onAfterRefreshCounter) {
this.onAfterRefreshCounter.call(
null, tf, this.rowsCounterSpan, totTxt);
this.onAfterRefreshCounter.call(null, tf, this.label, totTxt);
}
}
@ -209,13 +206,13 @@ export class RowsCounter extends Feature {
return;
}
if (!this.rowsCounterTgtId && this.rowsCounterDiv) {
removeElm(this.rowsCounterDiv);
if (!this.targetId && this.container) {
removeElm(this.container);
} else {
elm(this.rowsCounterTgtId).innerHTML = '';
elm(this.targetId).innerHTML = '';
}
this.rowsCounterSpan = null;
this.rowsCounterDiv = null;
this.label = null;
this.container = null;
// unsubscribe to events
this.emitter.off(['after-filtering', 'grouped-by-page'],

16
test/test-dom-changes.js
View file

@ -20,7 +20,7 @@ test('Initial verifications', function() {
deepEqual(tf.getFilterableRowsNb(), 7, 'Initial number of filterable rows');
deepEqual(tf.getValidRowsNb(), 0, 'Initial number of valid rows');
notEqual(rowsCounter, null, 'RowsCounter instanciated');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7', 'Initial rows count');
deepEqual(rowsCounter.label.innerHTML, '7', 'Initial rows count');
});
module('DOM changes');
@ -37,7 +37,7 @@ test('Can filter after row is removed', function() {
'Number of filterable rows after row is removed');
deepEqual(tf.getValidRowsNb(), 6,
'Number of valid rows after row is removed');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '6',
deepEqual(rowsCounter.label.innerHTML, '6',
'Rows count after row is removed');
});
@ -54,7 +54,7 @@ test('Can filter after row is added', function() {
'Number of filterable rows after row is added');
deepEqual(tf.getValidRowsNb(), 7,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7',
deepEqual(rowsCounter.label.innerHTML, '7',
'Rows count after row is added');
});
@ -72,7 +72,7 @@ test('Can filter the added row', function() {
'Number of filterable rows after row is added');
deepEqual(tf.getValidRowsNb(), 1,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1',
deepEqual(rowsCounter.label.innerHTML, '1',
'Rows count after row is added');
});
@ -95,7 +95,7 @@ test('Sanity checks', function() {
'Initial number of filterable rows');
deepEqual(tf1.getValidRowsNb(), 7, 'Initial number of valid rows');
notEqual(rowsCounter, null, 'RowsCounter instanciated');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1-3 / 7',
deepEqual(rowsCounter.label.innerHTML, '1-3 / 7',
'Initial rows count');
});
@ -115,7 +115,7 @@ test('Can filter and change a page after row is removed', function() {
'Number of filterable rows after row is removed');
deepEqual(tf1.getValidRowsNb(), 6,
'Number of valid rows after row is removed');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '4-6 / 6',
deepEqual(rowsCounter.label.innerHTML, '4-6 / 6',
'Rows count after row is removed');
});
@ -135,7 +135,7 @@ test('Can filter and change page after row is added', function() {
'Number of filterable rows after row is added');
deepEqual(tf1.getValidRowsNb(), 7,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '7-7 / 7',
deepEqual(rowsCounter.label.innerHTML, '7-7 / 7',
'Rows count after row is added');
});
@ -155,7 +155,7 @@ test('Can filter the added row with paging', function() {
'Number of filterable rows after row is added');
deepEqual(tf1.getValidRowsNb(), 1,
'Number of valid rows after row is added');
deepEqual(rowsCounter.rowsCounterSpan.innerHTML, '1-1 / 1',
deepEqual(rowsCounter.label.innerHTML, '1-1 / 1',
'Rows count after row is added');
});

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

@ -58,7 +58,7 @@ test('Can check is enabled', function() {
module('Behaviour');
test('RowsCounter value', function() {
equal(rowsCounter.rowsCounterSpan.innerHTML,
equal(rowsCounter.label.innerHTML,
7, 'Counter value');
});
@ -66,7 +66,7 @@ test('RowsCounter component with filtered table', function() {
tf.setFilterValue(0, 'Syd');
tf.filter();
equal(rowsCounter.rowsCounterSpan.innerHTML,
equal(rowsCounter.label.innerHTML,
4, 'Counter value');
tf.clearFilters();
@ -83,7 +83,7 @@ test('RowsCounter component with paging', function() {
paging_length: 3
});
tf.init();
equal(tf.feature('rowsCounter').rowsCounterSpan.innerHTML,
equal(tf.feature('rowsCounter').label.innerHTML,
'1-3 / 7', 'Counter value with paging');
});
test('Can calculate page on page change', function() {
@ -94,7 +94,7 @@ test('Can calculate page on page change', function() {
paging.setPage(2);
//assert
equal(tf.feature('rowsCounter').rowsCounterSpan.innerHTML,
equal(tf.feature('rowsCounter').label.innerHTML,
'4-6 / 7', 'Counter value with paging');
});