deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-06-20 06:35:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #201 from koalyptus/issue-197-misc-refactoring

Browse source 
Issue 197 misc refactoring
This commit is contained in:
koalyptus 2016-05-04 22:13:55 +10:00
parent 0e626a3a62 5f667f733f
commit e75e6897fd
15 changed files with 295 additions and 216 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.17 - Starter</title>
<title>tablefilter v0.2.18 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.17</h1>
<h1>tablefilter v0.2.18</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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.17 by Max Guglielmi
* build date: 2016-05-01T09:47:23.351Z
* tablefilter v0.2.18 by Max Guglielmi
* build date: 2016-05-04T11:57:09.772Z
* 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
View file

File diff suppressed because one or more lines are too long

8
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.17",
"version": "0.2.18",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {

29
src/modules/checkList.js
View file

@ -4,6 +4,7 @@ import Arr from '../array';
import Str from '../string';
import Sort from '../sort';
import Event from '../event';
import Types from '../types';
const SORT_ERROR = 'Filter options for column {0} cannot be sorted in ' +
'{1} manner.';
@ -176,7 +177,8 @@ export class CheckList extends Feature{
(tf.linkedFilters && tf.disableExcludedOptions))) ||
(colIndex === j && tf.linkedFilters &&
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && ((!activeIdx || activeIdx === colIndex )||
(tf.paging && ((!activeIdx ||
activeIdx === colIndex) ||
(activeIdx != colIndex &&
tf.validRowsIndex.indexOf(k) != -1)))))) {
@ -370,7 +372,8 @@ export class CheckList extends Feature{
//checked items loop
for (let u = 0; u < indSplit.length; u++) {
//checked item
let cChk = Dom.id(tf.fltIds[colIndex]+'_'+indSplit[u]);
let cChk = Dom.id(tf.fltIds[colIndex] + '_' +
indSplit[u]);
if (cChk) {
cChk.checked = false;
Dom.removeClass(
@ -385,7 +388,8 @@ export class CheckList extends Feature{
} else {
fltValue = (fltValue) ? fltValue : '';
chkValue = Str.trim(fltValue+' '+chkValue+' '+tf.orOperator);
chkValue = Str.trim(fltValue + ' ' + chkValue + ' ' +
tf.orOperator);
chkIndex = fltIndexes + chkIndex + tf.separator;
n.setAttribute('value', chkValue);
n.setAttribute('indexes', chkIndex);
@ -452,6 +456,25 @@ export class CheckList extends Feature{
}
}
/**
* Get filter values for a given column index
* @param {Number} colIndex Column index
* @returns {Array} values Collection of selected values
*/
getValues(colIndex) {
let tf = this.tf;
let flt = tf.getFilterElement(colIndex);
let fltAttr = flt.getAttribute('value');
let values = Types.isEmpty(fltAttr) ? '' : fltAttr;
//removes last operator ||
values = values.substr(0, values.length - 3);
//turn || separated values into array
values = values.split(' ' + tf.orOperator + ' ');
return values;
}
destroy() {
this.emitter.off(
['build-checklist-filter'],

18
src/modules/dropdown.js
View file

@ -175,7 +175,8 @@ export class Dropdown extends Feature{
(tf.paging && (!tf.validRowsIndex ||
(tf.validRowsIndex &&
tf.validRowsIndex.indexOf(k) != -1)) &&
((activeIdx === undefined || activeIdx === colIndex) ||
((activeIdx === undefined ||
activeIdx === colIndex) ||
(activeIdx != colIndex &&
tf.validRowsIndex.indexOf(k) != -1)))))) {
let cellData = tf.getCellData(cell[j]),
@ -355,6 +356,21 @@ export class Dropdown extends Feature{
});
}
/**
* Get filter values for a given column index
* @param {Number} colIndex Column index
* @returns {Array} values Array of selected values
*/
getValues(colIndex) {
let tf = this.tf;
let slc = tf.getFilterElement(colIndex);
let values = [];
[].forEach.call(slc.selectedOptions,
option => values.push(option.value));
return values;
}
destroy() {
this.emitter.off(
['build-select-filter'],

35
src/tablefilter.js
View file

@ -1549,11 +1549,10 @@ export class TableFilter {
if (!this.fltGrid) {
return;
}
let fltValue = '',
fltValues = [],
flt = this.getFilterElement(index);
let fltValue = '';
let flt = this.getFilterElement(index);
if (!flt) {
return '';
return fltValue;
}
let fltColType = this.getFilterType(index);
@ -1563,33 +1562,19 @@ export class TableFilter {
}
//mutiple select
else if (fltColType === this.fltTypeMulti) {
// TODO: extract a method in dropdown module from below
for (let j = 0, len = flt.options.length; j < len; j++) {
if (flt.options[j].selected) {
fltValues.push(flt.options[j].value);
}
}
//return empty string if collection is empty
fltValue = fltValues.length > 0 ? fltValues : '';
fltValue = this.feature('dropdown').getValues(index);
}
//checklist
else if (fltColType === this.fltTypeCheckList) {
// TODO: extract a method in checklist module from below
if (flt.getAttribute('value') !== null) {
fltValues = flt.getAttribute('value');
//removes last operator ||
fltValues = fltValues.substr(0, fltValues.length - 3);
//convert || separated values into array
fltValues = fltValues.split(' ' + this.orOperator + ' ');
fltValue = this.feature('checkList').getValues(index);
}
//return empty string if collection is empty
fltValue = fltValues.length > 0 ? fltValues : '';
}
//return an empty string if collection contains a single empty string
if (Types.isArray(fltValue) && fltValue.length === 1 &&
fltValue[0] === '') {
//return an empty string if collection is empty or contains a single
//empty string
if (Types.isArray(fltValue) && fltValue.length === 0 ||
(fltValue.length === 1 && fltValue[0] === '')) {
fltValue = '';
}
return fltValue;
}

32
test/test-checklist.js
View file

@ -45,6 +45,38 @@ test('Can select options', function() {
notEqual(flt1.getAttribute('value').indexOf('1.4'), -1, 'Option selected');
notEqual(flt1.getAttribute('value').indexOf('.6'), -1, 'Option selected');
});
test('Can get selected values', function() {
//setup
var values = ['.6', '1.4'];
tf.clearFilters();
tf.setFilterValue(3, values);
//act
var result = checkList.getValues(3);
//assert
deepEqual(values, result);
});
test('Can return values when no selected options', function() {
//setup
tf.clearFilters();
//act
var result = checkList.getValues(3);
//assert
deepEqual([''], result);
});
test('Can return values checklist element has no value attribute', function() {
//setup
tf.getFilterElement(3).removeAttribute('value');
//act
var result = checkList.getValues(3);
//assert
deepEqual([''], result);
});
// Issue 113, addressing option sorting for numeric values
module('Options sorting');

23
test/test-dropdown.js
View file

@ -46,6 +46,29 @@ test('Can select options', function() {
deepEqual(flt1.options[6].selected, true, 'Option selected');
});
test('Can get selected values', function() {
//setup
var values = ['286', '872'];
tf.clearFilters();
tf.setFilterValue(2, values);
//act
var result = dropdown.getValues(2);
//assert
deepEqual(values, result);
});
test('Can return values when no selected options', function() {
//setup
tf.clearFilters();
//act
var result = dropdown.getValues(2);
//assert
deepEqual([], result);
});
// Issue 113, addressing option sorting for numeric values
module('Options sorting');
test('Can sort options', function() {