mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-23 00:32:21 +02:00
Merge pull request #201 from koalyptus/issue-197-misc-refactoring
Issue 197 misc refactoring
This commit is contained in:
koalyptus
commit
e75e6897fd
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -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
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -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
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
|
@ -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
4
dist/tablefilter/style/tablefilter.css
vendored
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
@ -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}
|
||||
|
|
@ -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
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.2.17",
|
||||
"version": "0.2.18",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -4,17 +4,18 @@ 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.';
|
||||
|
||||
export class CheckList extends Feature{
|
||||
export class CheckList extends Feature {
|
||||
|
||||
/**
|
||||
* Checklist UI component
|
||||
* @param {Object} tf TableFilter instance
|
||||
*/
|
||||
constructor(tf){
|
||||
constructor(tf) {
|
||||
super(tf, 'checkList');
|
||||
|
||||
// Configuration object
|
||||
|
|
@ -40,7 +41,7 @@ export class CheckList extends Feature{
|
|||
f.checklist_item_disabled_css_class ||
|
||||
'flt_checklist_item_disabled';
|
||||
this.enableCheckListResetFilter =
|
||||
f.enable_checklist_reset_filter===false ? false : true;
|
||||
f.enable_checklist_reset_filter === false ? false : true;
|
||||
//checklist filter container div
|
||||
this.prfxCheckListDiv = 'chkdiv_';
|
||||
|
||||
|
|
@ -50,25 +51,25 @@ export class CheckList extends Feature{
|
|||
this.excludedOpts = null;
|
||||
}
|
||||
|
||||
onChange(evt){
|
||||
onChange(evt) {
|
||||
let elm = Event.target(evt);
|
||||
let tf = this.tf;
|
||||
this.emitter.emit('filter-focus', tf, elm);
|
||||
tf.filter();
|
||||
}
|
||||
|
||||
optionClick(evt){
|
||||
optionClick(evt) {
|
||||
this.setCheckListValues(evt.target);
|
||||
this.onChange(evt);
|
||||
}
|
||||
|
||||
onCheckListClick(evt){
|
||||
onCheckListClick(evt) {
|
||||
let elm = Event.target(evt);
|
||||
if(this.tf.loadFltOnDemand && elm.getAttribute('filled') === '0'){
|
||||
if (this.tf.loadFltOnDemand && elm.getAttribute('filled') === '0') {
|
||||
let ct = elm.getAttribute('ct');
|
||||
let div = this.checkListDiv[ct];
|
||||
this.build(ct);
|
||||
Event.remove(div, 'click', (evt)=> this.onCheckListClick(evt));
|
||||
Event.remove(div, 'click', (evt) => this.onCheckListClick(evt));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -78,18 +79,18 @@ export class CheckList extends Feature{
|
|||
* @param {Boolean} isExternal External filter flag
|
||||
* @param {DOMElement} container Dom element containing the filter
|
||||
*/
|
||||
init(colIndex, isExternal, container){
|
||||
init(colIndex, isExternal, container) {
|
||||
let tf = this.tf;
|
||||
let externalFltTgtId = isExternal ?
|
||||
tf.externalFltTgtIds[colIndex] : null;
|
||||
|
||||
let divCont = Dom.create('div',
|
||||
['id', this.prfxCheckListDiv+colIndex+'_'+tf.id],
|
||||
['id', this.prfxCheckListDiv + colIndex + '_' + tf.id],
|
||||
['ct', colIndex], ['filled', '0']);
|
||||
divCont.className = this.checkListDivCssClass;
|
||||
|
||||
//filter is appended in desired element
|
||||
if(externalFltTgtId){
|
||||
if (externalFltTgtId) {
|
||||
Dom.id(externalFltTgtId).appendChild(divCont);
|
||||
tf.externalFltEls.push(divCont);
|
||||
} else {
|
||||
|
|
@ -97,23 +98,23 @@ export class CheckList extends Feature{
|
|||
}
|
||||
|
||||
this.checkListDiv[colIndex] = divCont;
|
||||
tf.fltIds.push(tf.prfxFlt+colIndex+'_'+tf.id);
|
||||
tf.fltIds.push(tf.prfxFlt + colIndex + '_' + tf.id);
|
||||
|
||||
if(!tf.loadFltOnDemand){
|
||||
if (!tf.loadFltOnDemand) {
|
||||
this.build(colIndex);
|
||||
} else {
|
||||
Event.add(divCont, 'click', (evt)=> this.onCheckListClick(evt));
|
||||
Event.add(divCont, 'click', (evt) => this.onCheckListClick(evt));
|
||||
divCont.appendChild(Dom.text(this.activateCheckListTxt));
|
||||
}
|
||||
|
||||
this.emitter.on(
|
||||
['build-checklist-filter'],
|
||||
(tf, colIndex, isExternal)=> this.build(colIndex, isExternal)
|
||||
(tf, colIndex, isExternal) => this.build(colIndex, isExternal)
|
||||
);
|
||||
|
||||
this.emitter.on(
|
||||
['select-checklist-options'],
|
||||
(tf, colIndex, values)=> this.selectOptions(colIndex, values)
|
||||
(tf, colIndex, values) => this.selectOptions(colIndex, values)
|
||||
);
|
||||
|
||||
this.initialized = true;
|
||||
|
|
@ -123,7 +124,7 @@ export class CheckList extends Feature{
|
|||
* Build checklist UI
|
||||
* @param {Number} colIndex Column index
|
||||
*/
|
||||
build(colIndex){
|
||||
build(colIndex) {
|
||||
let tf = this.tf;
|
||||
colIndex = parseInt(colIndex, 10);
|
||||
|
||||
|
|
@ -136,28 +137,28 @@ export class CheckList extends Feature{
|
|||
let ul = Dom.create(
|
||||
'ul', ['id', tf.fltIds[colIndex]], ['colIndex', colIndex]);
|
||||
ul.className = this.checkListCssClass;
|
||||
Event.add(ul, 'change', (evt)=> this.onChange(evt));
|
||||
Event.add(ul, 'change', (evt) => this.onChange(evt));
|
||||
|
||||
let rows = tf.tbl.rows;
|
||||
this.isCustom = tf.isCustomOptions(colIndex);
|
||||
|
||||
let activeIdx;
|
||||
let activeFilterId = tf.getActiveFilterId();
|
||||
if(tf.linkedFilters && activeFilterId){
|
||||
if (tf.linkedFilters && activeFilterId) {
|
||||
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
|
||||
}
|
||||
|
||||
let filteredDataCol = [];
|
||||
if(tf.linkedFilters && tf.disableExcludedOptions){
|
||||
if (tf.linkedFilters && tf.disableExcludedOptions) {
|
||||
this.excludedOpts = [];
|
||||
}
|
||||
|
||||
flt.innerHTML = '';
|
||||
|
||||
for(let k=tf.refRow; k<tf.nbRows; k++){
|
||||
for (let k = tf.refRow; k < tf.nbRows; k++) {
|
||||
// always visible rows don't need to appear on selects as always
|
||||
// valid
|
||||
if(tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1){
|
||||
if (tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -165,36 +166,37 @@ export class CheckList extends Feature{
|
|||
let ncells = cells.length;
|
||||
|
||||
// checks if row has exact cell #
|
||||
if(ncells !== tf.nbCells || this.isCustom){
|
||||
if (ncells !== tf.nbCells || this.isCustom) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// this loop retrieves cell data
|
||||
for(let j=0; j<ncells; j++){
|
||||
for (let j = 0; j < ncells; j++) {
|
||||
// WTF: cyclomatic complexity hell :)
|
||||
if((colIndex === j && (!tf.linkedFilters ||
|
||||
(tf.linkedFilters && tf.disableExcludedOptions)))||
|
||||
if ((colIndex === j && (!tf.linkedFilters ||
|
||||
(tf.linkedFilters && tf.disableExcludedOptions))) ||
|
||||
(colIndex === j && tf.linkedFilters &&
|
||||
((rows[k].style.display === '' && !tf.paging) ||
|
||||
(tf.paging && ((!activeIdx || activeIdx === colIndex )||
|
||||
(activeIdx != colIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1)) )))){
|
||||
((rows[k].style.display === '' && !tf.paging) ||
|
||||
(tf.paging && ((!activeIdx ||
|
||||
activeIdx === colIndex) ||
|
||||
(activeIdx != colIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1)))))) {
|
||||
|
||||
let cellData = tf.getCellData(cells[j]);
|
||||
//Vary Peter's patch
|
||||
let cellString = Str.matchCase(cellData, tf.matchCase);
|
||||
// checks if celldata is already in array
|
||||
if(!Arr.has(this.opts, cellString, tf.matchCase)){
|
||||
if (!Arr.has(this.opts, cellString, tf.matchCase)) {
|
||||
this.opts.push(cellData);
|
||||
}
|
||||
let filteredCol = filteredDataCol[j];
|
||||
if(tf.linkedFilters && tf.disableExcludedOptions){
|
||||
if(!filteredCol){
|
||||
if (tf.linkedFilters && tf.disableExcludedOptions) {
|
||||
if (!filteredCol) {
|
||||
filteredCol = tf.getFilteredDataCol(j);
|
||||
}
|
||||
if(!Arr.has(filteredCol, cellString, tf.matchCase) &&
|
||||
if (!Arr.has(filteredCol, cellString, tf.matchCase) &&
|
||||
!Arr.has(this.excludedOpts,
|
||||
cellString, tf.matchCase)){
|
||||
cellString, tf.matchCase)) {
|
||||
this.excludedOpts.push(cellData);
|
||||
}
|
||||
}
|
||||
|
|
@ -203,51 +205,51 @@ export class CheckList extends Feature{
|
|||
}
|
||||
|
||||
//Retrieves custom values
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
let customValues = tf.getCustomOptions(colIndex);
|
||||
this.opts = customValues[0];
|
||||
this.optsTxt = customValues[1];
|
||||
}
|
||||
|
||||
if(tf.sortSlc && !this.isCustom){
|
||||
if (!tf.matchCase){
|
||||
if (tf.sortSlc && !this.isCustom) {
|
||||
if (!tf.matchCase) {
|
||||
this.opts.sort(Sort.ignoreCase);
|
||||
if(this.excludedOpts){
|
||||
if (this.excludedOpts) {
|
||||
this.excludedOpts.sort(Sort.ignoreCase);
|
||||
}
|
||||
} else {
|
||||
this.opts.sort();
|
||||
if(this.excludedOpts){
|
||||
if (this.excludedOpts) {
|
||||
this.excludedOpts.sort();
|
||||
}
|
||||
}
|
||||
}
|
||||
//asc sort
|
||||
if(tf.sortNumAsc.indexOf(colIndex) != -1){
|
||||
try{
|
||||
if (tf.sortNumAsc.indexOf(colIndex) != -1) {
|
||||
try {
|
||||
this.opts.sort(Sort.numSortAsc);
|
||||
if(this.excludedOpts){
|
||||
if (this.excludedOpts) {
|
||||
this.excludedOpts.sort(Sort.numSortAsc);
|
||||
}
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
this.optsTxt.sort(Sort.numSortAsc);
|
||||
}
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
throw new Error(SORT_ERROR.replace('{0}', colIndex)
|
||||
.replace('{1}', 'ascending'));
|
||||
}//in case there are alphanumeric values
|
||||
}
|
||||
//desc sort
|
||||
if(tf.sortNumDesc.indexOf(colIndex) != -1){
|
||||
try{
|
||||
if (tf.sortNumDesc.indexOf(colIndex) != -1) {
|
||||
try {
|
||||
this.opts.sort(Sort.numSortDesc);
|
||||
if(this.excludedOpts){
|
||||
if (this.excludedOpts) {
|
||||
this.excludedOpts.sort(Sort.numSortDesc);
|
||||
}
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
this.optsTxt.sort(Sort.numSortDesc);
|
||||
}
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
throw new Error(SORT_ERROR.replace('{0}', colIndex)
|
||||
.replace('{1}', 'descending'));
|
||||
}//in case there are alphanumeric values
|
||||
|
|
@ -255,7 +257,7 @@ export class CheckList extends Feature{
|
|||
|
||||
this.addChecks(colIndex, ul);
|
||||
|
||||
if(tf.loadFltOnDemand){
|
||||
if (tf.loadFltOnDemand) {
|
||||
flt.innerHTML = '';
|
||||
}
|
||||
flt.appendChild(ul);
|
||||
|
|
@ -269,28 +271,28 @@ export class CheckList extends Feature{
|
|||
* @param {Number} colIndex Column index
|
||||
* @param {Object} ul Ul element
|
||||
*/
|
||||
addChecks(colIndex, ul){
|
||||
addChecks(colIndex, ul) {
|
||||
let tf = this.tf;
|
||||
let chkCt = this.addTChecks(colIndex, ul);
|
||||
|
||||
for(let y=0; y<this.opts.length; y++){
|
||||
for (let y = 0; y < this.opts.length; y++) {
|
||||
let val = this.opts[y]; //item value
|
||||
let lbl = this.isCustom ? this.optsTxt[y] : val; //item text
|
||||
let li = Dom.createCheckItem(
|
||||
tf.fltIds[colIndex]+'_'+(y+chkCt), val, lbl);
|
||||
tf.fltIds[colIndex] + '_' + (y + chkCt), val, lbl);
|
||||
li.className = this.checkListItemCssClass;
|
||||
if(tf.linkedFilters && tf.disableExcludedOptions &&
|
||||
if (tf.linkedFilters && tf.disableExcludedOptions &&
|
||||
Arr.has(this.excludedOpts,
|
||||
Str.matchCase(val, tf.matchCase), tf.matchCase)){
|
||||
Str.matchCase(val, tf.matchCase), tf.matchCase)) {
|
||||
Dom.addClass(li, this.checkListItemDisabledCssClass);
|
||||
li.check.disabled = true;
|
||||
li.disabled = true;
|
||||
} else {
|
||||
Event.add(li.check, 'click', (evt)=> this.optionClick(evt));
|
||||
Event.add(li.check, 'click', (evt) => this.optionClick(evt));
|
||||
}
|
||||
ul.appendChild(li);
|
||||
|
||||
if(val === ''){
|
||||
if (val === '') {
|
||||
//item is hidden
|
||||
li.style.display = 'none';
|
||||
}
|
||||
|
|
@ -302,38 +304,38 @@ export class CheckList extends Feature{
|
|||
* @param {Number} colIndex Column index
|
||||
* @param {Object} ul Ul element
|
||||
*/
|
||||
addTChecks(colIndex, ul){
|
||||
addTChecks(colIndex, ul) {
|
||||
let tf = this.tf;
|
||||
let chkCt = 1;
|
||||
let li0 = Dom.createCheckItem(
|
||||
tf.fltIds[colIndex]+'_0', '', tf.displayAllText);
|
||||
tf.fltIds[colIndex] + '_0', '', tf.displayAllText);
|
||||
li0.className = this.checkListItemCssClass;
|
||||
ul.appendChild(li0);
|
||||
|
||||
Event.add(li0.check, 'click', (evt)=> this.optionClick(evt));
|
||||
Event.add(li0.check, 'click', (evt) => this.optionClick(evt));
|
||||
|
||||
if(!this.enableCheckListResetFilter){
|
||||
if (!this.enableCheckListResetFilter) {
|
||||
li0.style.display = 'none';
|
||||
}
|
||||
|
||||
if(tf.enableEmptyOption){
|
||||
if (tf.enableEmptyOption) {
|
||||
let li1 = Dom.createCheckItem(
|
||||
tf.fltIds[colIndex]+'_1', tf.emOperator, tf.emptyText);
|
||||
tf.fltIds[colIndex] + '_1', tf.emOperator, tf.emptyText);
|
||||
li1.className = this.checkListItemCssClass;
|
||||
ul.appendChild(li1);
|
||||
Event.add(li1.check, 'click', (evt)=> this.optionClick(evt));
|
||||
Event.add(li1.check, 'click', (evt) => this.optionClick(evt));
|
||||
chkCt++;
|
||||
}
|
||||
|
||||
if(tf.enableNonEmptyOption){
|
||||
if (tf.enableNonEmptyOption) {
|
||||
let li2 = Dom.createCheckItem(
|
||||
tf.fltIds[colIndex]+'_2',
|
||||
tf.fltIds[colIndex] + '_2',
|
||||
tf.nmOperator,
|
||||
tf.nonEmptyText
|
||||
);
|
||||
li2.className = this.checkListItemCssClass;
|
||||
ul.appendChild(li2);
|
||||
Event.add(li2.check, 'click', (evt)=> this.optionClick(evt));
|
||||
Event.add(li2.check, 'click', (evt) => this.optionClick(evt));
|
||||
chkCt++;
|
||||
}
|
||||
return chkCt;
|
||||
|
|
@ -343,8 +345,8 @@ export class CheckList extends Feature{
|
|||
* Store checked options in DOM element attribute
|
||||
* @param {Object} o checklist option DOM element
|
||||
*/
|
||||
setCheckListValues(o){
|
||||
if(!o){
|
||||
setCheckListValues(o) {
|
||||
if (!o) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -361,17 +363,18 @@ export class CheckList extends Feature{
|
|||
let fltValue = n.getAttribute('value'); //filter value (ul tag)
|
||||
let fltIndexes = n.getAttribute('indexes'); //selected items (ul tag)
|
||||
|
||||
if(o.checked){
|
||||
if (o.checked) {
|
||||
//show all item
|
||||
if(chkValue === ''){
|
||||
if((fltIndexes && fltIndexes!=='')){
|
||||
if (chkValue === '') {
|
||||
if ((fltIndexes && fltIndexes !== '')) {
|
||||
//items indexes
|
||||
let indSplit = fltIndexes.split(tf.separator);
|
||||
//checked items loop
|
||||
for(let u=0; u<indSplit.length; u++){
|
||||
for (let u = 0; u < indSplit.length; u++) {
|
||||
//checked item
|
||||
let cChk = Dom.id(tf.fltIds[colIndex]+'_'+indSplit[u]);
|
||||
if(cChk){
|
||||
let cChk = Dom.id(tf.fltIds[colIndex] + '_' +
|
||||
indSplit[u]);
|
||||
if (cChk) {
|
||||
cChk.checked = false;
|
||||
Dom.removeClass(
|
||||
n.childNodes[indSplit[u]],
|
||||
|
|
@ -385,34 +388,35 @@ 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);
|
||||
//1st option unchecked
|
||||
if(Dom.id(tf.fltIds[colIndex]+'_0')){
|
||||
Dom.id(tf.fltIds[colIndex]+'_0').checked = false;
|
||||
if (Dom.id(tf.fltIds[colIndex] + '_0')) {
|
||||
Dom.id(tf.fltIds[colIndex] + '_0').checked = false;
|
||||
}
|
||||
}
|
||||
|
||||
if(li.nodeName === itemTag){
|
||||
if (li.nodeName === itemTag) {
|
||||
Dom.removeClass(
|
||||
n.childNodes[0], this.checkListSlcItemCssClass);
|
||||
Dom.addClass(li, this.checkListSlcItemCssClass);
|
||||
}
|
||||
} else { //removes values and indexes
|
||||
if(chkValue !== ''){
|
||||
if (chkValue !== '') {
|
||||
let replaceValue = new RegExp(
|
||||
Str.rgxEsc(chkValue+' '+tf.orOperator));
|
||||
fltValue = fltValue.replace(replaceValue,'');
|
||||
Str.rgxEsc(chkValue + ' ' + tf.orOperator));
|
||||
fltValue = fltValue.replace(replaceValue, '');
|
||||
n.setAttribute('value', Str.trim(fltValue));
|
||||
|
||||
let replaceIndex = new RegExp(
|
||||
Str.rgxEsc(chkIndex + tf.separator));
|
||||
Str.rgxEsc(chkIndex + tf.separator));
|
||||
fltIndexes = fltIndexes.replace(replaceIndex, '');
|
||||
n.setAttribute('indexes', fltIndexes);
|
||||
}
|
||||
if(li.nodeName === itemTag){
|
||||
if (li.nodeName === itemTag) {
|
||||
Dom.removeClass(li, this.checkListSlcItemCssClass);
|
||||
}
|
||||
}
|
||||
|
|
@ -423,10 +427,10 @@ export class CheckList extends Feature{
|
|||
* @param {Number} colIndex Column index
|
||||
* @param {Array} values Array of option values to select
|
||||
*/
|
||||
selectOptions(colIndex, values=[]){
|
||||
selectOptions(colIndex, values = []) {
|
||||
let tf = this.tf;
|
||||
if(tf.getFilterType(colIndex) !== tf.fltTypeCheckList ||
|
||||
values.length === 0){
|
||||
if (tf.getFilterType(colIndex) !== tf.fltTypeCheckList ||
|
||||
values.length === 0) {
|
||||
return;
|
||||
}
|
||||
let flt = tf.getFilterElement(colIndex);
|
||||
|
|
@ -436,30 +440,49 @@ export class CheckList extends Feature{
|
|||
flt.setAttribute('value', '');
|
||||
flt.setAttribute('indexes', '');
|
||||
|
||||
for(let k=0; k<lisNb; k++){
|
||||
for (let k = 0; k < lisNb; k++) {
|
||||
let li = Dom.tag(flt, 'li')[k],
|
||||
lbl = Dom.tag(li, 'label')[0],
|
||||
chk = Dom.tag(li, 'input')[0],
|
||||
lblTxt = Str.matchCase(Dom.getText(lbl), tf.caseSensitive);
|
||||
if(lblTxt !== '' && Arr.has(values, lblTxt, tf.caseSensitive)){
|
||||
if (lblTxt !== '' && Arr.has(values, lblTxt, tf.caseSensitive)) {
|
||||
chk.checked = true;
|
||||
this.setCheckListValues(chk);
|
||||
}
|
||||
else{
|
||||
else {
|
||||
chk.checked = false;
|
||||
this.setCheckListValues(chk);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
destroy(){
|
||||
/**
|
||||
* 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'],
|
||||
(tf, colIndex, isExternal)=> this.build(colIndex, isExternal)
|
||||
(tf, colIndex, isExternal) => this.build(colIndex, isExternal)
|
||||
);
|
||||
this.emitter.off(
|
||||
['select-checklist-options'],
|
||||
(tf, colIndex, values)=> this.selectOptions(colIndex, values)
|
||||
(tf, colIndex, values) => this.selectOptions(colIndex, values)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@ import Event from '../event';
|
|||
const SORT_ERROR = 'Filter options for column {0} cannot be sorted in ' +
|
||||
'{1} manner.';
|
||||
|
||||
export class Dropdown extends Feature{
|
||||
export class Dropdown extends Feature {
|
||||
|
||||
/**
|
||||
* Dropdown UI component
|
||||
* @param {Object} tf TableFilter instance
|
||||
*/
|
||||
constructor(tf){
|
||||
constructor(tf) {
|
||||
super(tf, 'dropdown');
|
||||
|
||||
// Configuration object
|
||||
let f = tf.config();
|
||||
|
||||
this.enableSlcResetFilter = f.enable_slc_reset_filter===false ?
|
||||
this.enableSlcResetFilter = f.enable_slc_reset_filter === false ?
|
||||
false : true;
|
||||
//defines empty option text
|
||||
this.nonEmptyText = f.non_empty_text || '(Non empty)';
|
||||
|
|
@ -41,7 +41,7 @@ export class Dropdown extends Feature{
|
|||
let elm = Event.target(e);
|
||||
let tf = this.tf;
|
||||
// select is populated when element has focus
|
||||
if(tf.loadFltOnDemand && elm.getAttribute('filled') === '0'){
|
||||
if (tf.loadFltOnDemand && elm.getAttribute('filled') === '0') {
|
||||
let ct = elm.getAttribute('ct');
|
||||
this.build(ct);
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@ export class Dropdown extends Feature{
|
|||
}
|
||||
|
||||
onSlcChange() {
|
||||
if(this.tf.onSlcChange){
|
||||
if (this.tf.onSlcChange) {
|
||||
this.tf.filter();
|
||||
}
|
||||
}
|
||||
|
|
@ -60,18 +60,18 @@ export class Dropdown extends Feature{
|
|||
* @param {Boolean} isExternal External filter flag
|
||||
* @param {DOMElement} container Dom element containing the filter
|
||||
*/
|
||||
init(colIndex, isExternal, container){
|
||||
init(colIndex, isExternal, container) {
|
||||
let tf = this.tf;
|
||||
let col = tf.getFilterType(colIndex);
|
||||
let externalFltTgtId = isExternal ?
|
||||
tf.externalFltTgtIds[colIndex] : null;
|
||||
|
||||
let slc = Dom.create(tf.fltTypeSlc,
|
||||
['id', tf.prfxFlt+colIndex+'_'+tf.id],
|
||||
['id', tf.prfxFlt + colIndex + '_' + tf.id],
|
||||
['ct', colIndex], ['filled', '0']
|
||||
);
|
||||
|
||||
if(col === tf.fltTypeMulti){
|
||||
if (col === tf.fltTypeMulti) {
|
||||
slc.multiple = tf.fltTypeMulti;
|
||||
slc.title = this.multipleSlcTooltip;
|
||||
}
|
||||
|
|
@ -79,7 +79,7 @@ export class Dropdown extends Feature{
|
|||
tf.fltCssClass : tf.fltMultiCssClass;
|
||||
|
||||
//filter is appended in container element
|
||||
if(externalFltTgtId){
|
||||
if (externalFltTgtId) {
|
||||
Dom.id(externalFltTgtId).appendChild(slc);
|
||||
tf.externalFltEls.push(slc);
|
||||
} else {
|
||||
|
|
@ -88,7 +88,7 @@ export class Dropdown extends Feature{
|
|||
|
||||
tf.fltIds.push(slc.id);
|
||||
|
||||
if(!tf.loadFltOnDemand){
|
||||
if (!tf.loadFltOnDemand) {
|
||||
this.build(colIndex);
|
||||
} else {
|
||||
//1st option is created here since build isn't invoked
|
||||
|
|
@ -96,17 +96,17 @@ export class Dropdown extends Feature{
|
|||
slc.appendChild(opt0);
|
||||
}
|
||||
|
||||
Event.add(slc, 'change', ()=> this.onSlcChange());
|
||||
Event.add(slc, 'focus', (e)=> this.onSlcFocus(e));
|
||||
Event.add(slc, 'change', () => this.onSlcChange());
|
||||
Event.add(slc, 'focus', (e) => this.onSlcFocus(e));
|
||||
|
||||
this.emitter.on(
|
||||
['build-select-filter'],
|
||||
(tf, colIndex, isLinked, isExternal)=>
|
||||
(tf, colIndex, isLinked, isExternal) =>
|
||||
this.build(colIndex, isLinked, isExternal)
|
||||
);
|
||||
this.emitter.on(
|
||||
['select-options'],
|
||||
(tf, colIndex, values)=> this.selectOptions(colIndex, values)
|
||||
(tf, colIndex, values) => this.selectOptions(colIndex, values)
|
||||
);
|
||||
|
||||
this.initialized = true;
|
||||
|
|
@ -117,7 +117,7 @@ export class Dropdown extends Feature{
|
|||
* @param {Number} colIndex Column index
|
||||
* @param {Boolean} isLinked Enable linked refresh behaviour
|
||||
*/
|
||||
build(colIndex, isLinked=false){
|
||||
build(colIndex, isLinked = false) {
|
||||
let tf = this.tf;
|
||||
colIndex = parseInt(colIndex, 10);
|
||||
|
||||
|
|
@ -138,21 +138,21 @@ export class Dropdown extends Feature{
|
|||
//custom selects text
|
||||
let activeIdx;
|
||||
let activeFilterId = tf.getActiveFilterId();
|
||||
if(isLinked && activeFilterId){
|
||||
if (isLinked && activeFilterId) {
|
||||
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
|
||||
}
|
||||
|
||||
let excludedOpts = null,
|
||||
filteredDataCol = null;
|
||||
if(isLinked && tf.disableExcludedOptions){
|
||||
if (isLinked && tf.disableExcludedOptions) {
|
||||
excludedOpts = [];
|
||||
filteredDataCol = [];
|
||||
}
|
||||
|
||||
for(let k=tf.refRow; k<tf.nbRows; k++){
|
||||
for (let k = tf.refRow; k < tf.nbRows; k++) {
|
||||
// always visible rows don't need to appear on selects as always
|
||||
// valid
|
||||
if(tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1){
|
||||
if (tf.hasVisibleRows && tf.visibleRows.indexOf(k) !== -1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -160,41 +160,42 @@ export class Dropdown extends Feature{
|
|||
nchilds = cell.length;
|
||||
|
||||
// checks if row has exact cell #
|
||||
if(nchilds !== tf.nbCells || this.isCustom){
|
||||
if (nchilds !== tf.nbCells || this.isCustom) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// this loop retrieves cell data
|
||||
for(let j=0; j<nchilds; j++){
|
||||
for (let j = 0; j < nchilds; j++) {
|
||||
// WTF: cyclomatic complexity hell
|
||||
if((colIndex === j &&
|
||||
if ((colIndex === j &&
|
||||
(!isLinked ||
|
||||
(isLinked && tf.disableExcludedOptions))) ||
|
||||
(colIndex === j && isLinked &&
|
||||
((rows[k].style.display === '' && !tf.paging) ||
|
||||
(tf.paging && (!tf.validRowsIndex ||
|
||||
(tf.validRowsIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1)) &&
|
||||
((activeIdx === undefined || activeIdx === colIndex) ||
|
||||
(activeIdx != colIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1 ))) ))){
|
||||
(tf.paging && (!tf.validRowsIndex ||
|
||||
(tf.validRowsIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1)) &&
|
||||
((activeIdx === undefined ||
|
||||
activeIdx === colIndex) ||
|
||||
(activeIdx != colIndex &&
|
||||
tf.validRowsIndex.indexOf(k) != -1)))))) {
|
||||
let cellData = tf.getCellData(cell[j]),
|
||||
//Vary Peter's patch
|
||||
cellString = Str.matchCase(cellData, matchCase);
|
||||
|
||||
// checks if celldata is already in array
|
||||
if(!Arr.has(this.opts, cellString, matchCase)){
|
||||
if (!Arr.has(this.opts, cellString, matchCase)) {
|
||||
this.opts.push(cellData);
|
||||
}
|
||||
|
||||
if(isLinked && tf.disableExcludedOptions){
|
||||
if (isLinked && tf.disableExcludedOptions) {
|
||||
let filteredCol = filteredDataCol[j];
|
||||
if(!filteredCol){
|
||||
if (!filteredCol) {
|
||||
filteredCol = tf.getFilteredDataCol(j);
|
||||
}
|
||||
if(!Arr.has(filteredCol, cellString, matchCase) &&
|
||||
if (!Arr.has(filteredCol, cellString, matchCase) &&
|
||||
!Arr.has(
|
||||
excludedOpts, cellString, matchCase)){
|
||||
excludedOpts, cellString, matchCase)) {
|
||||
excludedOpts.push(cellData);
|
||||
}
|
||||
}
|
||||
|
|
@ -203,50 +204,50 @@ export class Dropdown extends Feature{
|
|||
}//for k
|
||||
|
||||
//Retrieves custom values
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
let customValues = tf.getCustomOptions(colIndex);
|
||||
this.opts = customValues[0];
|
||||
this.optsTxt = customValues[1];
|
||||
}
|
||||
|
||||
if(tf.sortSlc && !this.isCustom){
|
||||
if (!matchCase){
|
||||
if (tf.sortSlc && !this.isCustom) {
|
||||
if (!matchCase) {
|
||||
this.opts.sort(Sort.ignoreCase);
|
||||
if(excludedOpts){
|
||||
if (excludedOpts) {
|
||||
excludedOpts.sort(Sort.ignoreCase);
|
||||
}
|
||||
} else {
|
||||
this.opts.sort();
|
||||
if(excludedOpts){ excludedOpts.sort(); }
|
||||
if (excludedOpts) { excludedOpts.sort(); }
|
||||
}
|
||||
}
|
||||
|
||||
//asc sort
|
||||
if(tf.sortNumAsc.indexOf(colIndex) != -1){
|
||||
try{
|
||||
if (tf.sortNumAsc.indexOf(colIndex) != -1) {
|
||||
try {
|
||||
this.opts.sort(Sort.numSortAsc);
|
||||
if(excludedOpts){
|
||||
if (excludedOpts) {
|
||||
excludedOpts.sort(Sort.numSortAsc);
|
||||
}
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
this.optsTxt.sort(Sort.numSortAsc);
|
||||
}
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
throw new Error(SORT_ERROR.replace('{0}', colIndex)
|
||||
.replace('{1}', 'ascending'));
|
||||
}//in case there are alphanumeric values
|
||||
}
|
||||
//desc sort
|
||||
if(tf.sortNumDesc.indexOf(colIndex) != -1){
|
||||
try{
|
||||
if (tf.sortNumDesc.indexOf(colIndex) != -1) {
|
||||
try {
|
||||
this.opts.sort(Sort.numSortDesc);
|
||||
if(excludedOpts){
|
||||
if (excludedOpts) {
|
||||
excludedOpts.sort(Sort.numSortDesc);
|
||||
}
|
||||
if(this.isCustom){
|
||||
if (this.isCustom) {
|
||||
this.optsTxt.sort(Sort.numSortDesc);
|
||||
}
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
throw new Error(SORT_ERROR.replace('{0}', colIndex)
|
||||
.replace('{1}', 'ascending'));
|
||||
}//in case there are alphanumeric values
|
||||
|
|
@ -265,38 +266,38 @@ export class Dropdown extends Feature{
|
|||
* @param {Boolean} isLinked Enable linked refresh behaviour
|
||||
* @param {Array} excludedOpts Array of excluded options
|
||||
*/
|
||||
addOptions(colIndex, slc, isLinked, excludedOpts){
|
||||
addOptions(colIndex, slc, isLinked, excludedOpts) {
|
||||
let tf = this.tf,
|
||||
slcValue = slc.value;
|
||||
|
||||
slc.innerHTML = '';
|
||||
slc = this.addFirstOption(slc);
|
||||
|
||||
for(let y=0; y<this.opts.length; y++){
|
||||
if(this.opts[y]===''){
|
||||
for (let y = 0; y < this.opts.length; y++) {
|
||||
if (this.opts[y] === '') {
|
||||
continue;
|
||||
}
|
||||
let val = this.opts[y]; //option value
|
||||
let lbl = this.isCustom ? this.optsTxt[y] : val; //option text
|
||||
let isDisabled = false;
|
||||
if(isLinked && tf.disableExcludedOptions &&
|
||||
if (isLinked && tf.disableExcludedOptions &&
|
||||
Arr.has(
|
||||
excludedOpts,
|
||||
Str.matchCase(val, tf.matchCase),
|
||||
tf.matchCase
|
||||
)){
|
||||
)) {
|
||||
isDisabled = true;
|
||||
}
|
||||
|
||||
let opt;
|
||||
//fill select on demand
|
||||
if(tf.loadFltOnDemand && slcValue === this.opts[y] &&
|
||||
tf.getFilterType(colIndex) === tf.fltTypeSlc){
|
||||
if (tf.loadFltOnDemand && slcValue === this.opts[y] &&
|
||||
tf.getFilterType(colIndex) === tf.fltTypeSlc) {
|
||||
opt = Dom.createOpt(lbl, val, true);
|
||||
} else {
|
||||
opt = Dom.createOpt(lbl, val, false);
|
||||
}
|
||||
if(isDisabled){
|
||||
if (isDisabled) {
|
||||
opt.disabled = true;
|
||||
}
|
||||
slc.appendChild(opt);
|
||||
|
|
@ -309,20 +310,20 @@ export class Dropdown extends Feature{
|
|||
* Add drop-down header option
|
||||
* @param {Object} slc Select DOM element
|
||||
*/
|
||||
addFirstOption(slc){
|
||||
addFirstOption(slc) {
|
||||
let tf = this.tf;
|
||||
|
||||
let opt0 = Dom.createOpt(
|
||||
(!this.enableSlcResetFilter ? '' : tf.displayAllText),'');
|
||||
if(!this.enableSlcResetFilter){
|
||||
(!this.enableSlcResetFilter ? '' : tf.displayAllText), '');
|
||||
if (!this.enableSlcResetFilter) {
|
||||
opt0.style.display = 'none';
|
||||
}
|
||||
slc.appendChild(opt0);
|
||||
if(tf.enableEmptyOption){
|
||||
if (tf.enableEmptyOption) {
|
||||
let opt1 = Dom.createOpt(tf.emptyText, tf.emOperator);
|
||||
slc.appendChild(opt1);
|
||||
}
|
||||
if(tf.enableNonEmptyOption){
|
||||
if (tf.enableNonEmptyOption) {
|
||||
let opt2 = Dom.createOpt(tf.nonEmptyText, tf.nmOperator);
|
||||
slc.appendChild(opt2);
|
||||
}
|
||||
|
|
@ -334,36 +335,51 @@ export class Dropdown extends Feature{
|
|||
* @param {Number} colIndex Column index
|
||||
* @param {Array} values Array of option values to select
|
||||
*/
|
||||
selectOptions(colIndex, values=[]){
|
||||
selectOptions(colIndex, values = []) {
|
||||
let tf = this.tf;
|
||||
if(tf.getFilterType(colIndex) !== tf.fltTypeMulti ||
|
||||
values.length === 0){
|
||||
if (tf.getFilterType(colIndex) !== tf.fltTypeMulti ||
|
||||
values.length === 0) {
|
||||
return;
|
||||
}
|
||||
let slc = tf.getFilterElement(colIndex);
|
||||
[].forEach.call(slc.options, (option)=> {
|
||||
[].forEach.call(slc.options, (option) => {
|
||||
// Empty value means clear all selections and first option is the
|
||||
// clear all option
|
||||
if(values[0] === '' || option.value === ''){
|
||||
if (values[0] === '' || option.value === '') {
|
||||
option.selected = false;
|
||||
}
|
||||
|
||||
if(option.value !== '' &&
|
||||
Arr.has(values, option.value, true)){
|
||||
if (option.value !== '' &&
|
||||
Arr.has(values, option.value, true)) {
|
||||
option.selected = true;
|
||||
}//if
|
||||
});
|
||||
}
|
||||
|
||||
destroy(){
|
||||
/**
|
||||
* 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'],
|
||||
(colIndex, isLinked, isExternal)=>
|
||||
(colIndex, isLinked, isExternal) =>
|
||||
this.build(colIndex, isLinked, isExternal)
|
||||
);
|
||||
this.emitter.off(
|
||||
['select-options'],
|
||||
(tf, colIndex, values)=> this.selectOptions(colIndex, values)
|
||||
(tf, colIndex, values) => this.selectOptions(colIndex, values)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1356,7 +1356,7 @@ export class TableFilter {
|
|||
cellData.lastIndexOf(searchArg, cellData.length - 1) ===
|
||||
(cellData.length - 1) - (searchArg.length - 1) &&
|
||||
cellData.lastIndexOf(searchArg, cellData.length - 1)
|
||||
> -1 ? true : false;
|
||||
> -1 ? true : false;
|
||||
}
|
||||
//empty
|
||||
else if (hasEM) {
|
||||
|
|
@ -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 + ' ');
|
||||
}
|
||||
//return empty string if collection is empty
|
||||
fltValue = fltValues.length > 0 ? fltValues : '';
|
||||
fltValue = this.feature('checkList').getValues(index);
|
||||
}
|
||||
//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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue