mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-21 15:56:40 +02:00
Merge pull request #239 from koalyptus/issue-238-non-empty-option-persistence
Issue 238 non empty option persistence
This commit is contained in:
koalyptus
commit
1cd4f9e9b8
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.2.35 - Starter</title>
|
||||
<title>tablefilter v0.2.36 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.2.35</h1>
|
||||
<h1>tablefilter v0.2.36</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* 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.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* 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.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* 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.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* 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.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.677Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.935Z
|
||||
* 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
10
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
4
dist/tablefilter/tf-1.js
vendored
4
dist/tablefilter/tf-1.js
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.35 by Max Guglielmi
|
||||
* build date: 2016-06-02T04:09:12.661Z
|
||||
* tablefilter v0.2.36 by Max Guglielmi
|
||||
* build date: 2016-06-05T02:10:25.920Z
|
||||
* MIT License
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.2.35",
|
||||
"version": "0.2.36",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -13,48 +13,113 @@ import {CHECKLIST, NONE} from '../const';
|
|||
const SORT_ERROR = 'Filter options for column {0} cannot be sorted in ' +
|
||||
'{1} manner.';
|
||||
|
||||
/**
|
||||
* Checklist filter UI component
|
||||
*/
|
||||
export class CheckList extends Feature {
|
||||
|
||||
/**
|
||||
* Checklist UI component
|
||||
* @param {Object} tf TableFilter instance
|
||||
* Creates an instance of CheckList
|
||||
* @param {TableFilter} tf TableFilter instance
|
||||
*/
|
||||
constructor(tf) {
|
||||
super(tf, 'checkList');
|
||||
|
||||
// Configuration object
|
||||
let f = tf.config();
|
||||
let f = this.config;
|
||||
|
||||
this.checkListDiv = []; //checklist container div
|
||||
//defines css class for div containing checklist filter
|
||||
this.checkListDivCssClass = f.div_checklist_css_class ||
|
||||
'div_checklist';
|
||||
//defines css class for checklist filters
|
||||
this.checkListCssClass = f.checklist_css_class || 'flt_checklist';
|
||||
//defines css class for checklist item (li)
|
||||
this.checkListItemCssClass = f.checklist_item_css_class ||
|
||||
'flt_checklist_item';
|
||||
//defines css class for selected checklist item (li)
|
||||
this.checkListSlcItemCssClass = f.checklist_selected_item_css_class ||
|
||||
'flt_checklist_slc_item';
|
||||
//Load on demand text
|
||||
this.activateCheckListTxt = f.activate_checklist_text ||
|
||||
'Click to load filter data';
|
||||
//defines css class for checklist filters
|
||||
this.checkListItemDisabledCssClass =
|
||||
f.checklist_item_disabled_css_class ||
|
||||
/**
|
||||
* List of container DOM elements
|
||||
* @type {Array}
|
||||
*/
|
||||
this.containers = [];
|
||||
|
||||
/**
|
||||
* Css class for the container of the checklist filter (div)
|
||||
* @type {String}
|
||||
*/
|
||||
this.containerCssClass = f.div_checklist_css_class || 'div_checklist';
|
||||
|
||||
/**
|
||||
* Css class for the checklist filter element (ul)
|
||||
* @type {String}
|
||||
*/
|
||||
this.filterCssClass = f.checklist_css_class || 'flt_checklist';
|
||||
|
||||
/**
|
||||
* Css class for the item of a checklist (li)
|
||||
* @type {String}
|
||||
*/
|
||||
this.itemCssClass = f.checklist_item_css_class || 'flt_checklist_item';
|
||||
|
||||
/**
|
||||
* Css class for a selected item of a checklist (li)
|
||||
* @type {String}
|
||||
*/
|
||||
this.selectedItemCssClass =
|
||||
f.checklist_selected_item_css_class || 'flt_checklist_slc_item';
|
||||
|
||||
/**
|
||||
* Text placed in the filter's container when load filter on demand
|
||||
* feature is enabled
|
||||
* @type {String}
|
||||
*/
|
||||
this.activateText =
|
||||
f.activate_checklist_text || 'Click to load filter data';
|
||||
|
||||
/**
|
||||
* Css class for a disabled item of a checklist (li)
|
||||
* @type {String}
|
||||
*/
|
||||
this.disabledItemCssClass = f.checklist_item_disabled_css_class ||
|
||||
'flt_checklist_item_disabled';
|
||||
this.enableCheckListResetFilter =
|
||||
f.enable_checklist_reset_filter === false ? false : true;
|
||||
//checklist filter container div
|
||||
this.prfxCheckListDiv = 'chkdiv_';
|
||||
|
||||
this.isCustom = null;
|
||||
this.opts = null;
|
||||
this.optsTxt = null;
|
||||
this.excludedOpts = null;
|
||||
/**
|
||||
* Enable the reset filter option as first item
|
||||
* @type {Boolean}
|
||||
*/
|
||||
this.enableResetOption = f.enable_checklist_reset_filter === false ?
|
||||
false : true;
|
||||
|
||||
/**
|
||||
* Prefix for container element ID
|
||||
* @type {String}
|
||||
* @private
|
||||
*/
|
||||
this.prfx = 'chkdiv_';
|
||||
|
||||
/**
|
||||
* Has custom options
|
||||
* @type {Boolean}
|
||||
* @private
|
||||
*/
|
||||
this.isCustom = false;
|
||||
|
||||
/**
|
||||
* List of options values
|
||||
* @type {Array}
|
||||
* @private
|
||||
*/
|
||||
this.opts = [];
|
||||
|
||||
/**
|
||||
* List of options texts for custom values
|
||||
* @type {Array}
|
||||
* @private
|
||||
*/
|
||||
this.optsTxt = [];
|
||||
|
||||
/**
|
||||
* List of options to be excluded from the checklist filter
|
||||
* @type {Array}
|
||||
* @private
|
||||
*/
|
||||
this.excludedOpts = [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Checklist change event handler
|
||||
* @param {Event} evt
|
||||
*/
|
||||
onChange(evt) {
|
||||
let elm = targetEvt(evt);
|
||||
let tf = this.tf;
|
||||
|
|
@ -62,16 +127,24 @@ export class CheckList extends Feature {
|
|||
tf.filter();
|
||||
}
|
||||
|
||||
/**
|
||||
* Checklist option click event handler
|
||||
* @param {Event} evt
|
||||
*/
|
||||
optionClick(evt) {
|
||||
this.setCheckListValues(evt.target);
|
||||
this.onChange(evt);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checklist container click event handler for load on demand feature
|
||||
* @param {Event} evt
|
||||
*/
|
||||
onCheckListClick(evt) {
|
||||
let elm = targetEvt(evt);
|
||||
if (this.tf.loadFltOnDemand && elm.getAttribute('filled') === '0') {
|
||||
let ct = elm.getAttribute('ct');
|
||||
let div = this.checkListDiv[ct];
|
||||
let div = this.containers[ct];
|
||||
this.build(ct);
|
||||
removeEvt(div, 'click', (evt) => this.onCheckListClick(evt));
|
||||
}
|
||||
|
|
@ -89,9 +162,9 @@ export class CheckList extends Feature {
|
|||
tf.externalFltTgtIds[colIndex] : null;
|
||||
|
||||
let divCont = createElm('div',
|
||||
['id', this.prfxCheckListDiv + colIndex + '_' + tf.id],
|
||||
['id', this.prfx + colIndex + '_' + tf.id],
|
||||
['ct', colIndex], ['filled', '0']);
|
||||
divCont.className = this.checkListDivCssClass;
|
||||
divCont.className = this.containerCssClass;
|
||||
|
||||
//filter is appended in desired element
|
||||
if (externalFltTgtId) {
|
||||
|
|
@ -101,14 +174,14 @@ export class CheckList extends Feature {
|
|||
container.appendChild(divCont);
|
||||
}
|
||||
|
||||
this.checkListDiv[colIndex] = divCont;
|
||||
this.containers[colIndex] = divCont;
|
||||
tf.fltIds.push(tf.prfxFlt + colIndex + '_' + tf.id);
|
||||
|
||||
if (!tf.loadFltOnDemand) {
|
||||
this.build(colIndex);
|
||||
} else {
|
||||
addEvt(divCont, 'click', (evt) => this.onCheckListClick(evt));
|
||||
divCont.appendChild(createText(this.activateCheckListTxt));
|
||||
divCont.appendChild(createText(this.activateText));
|
||||
}
|
||||
|
||||
this.emitter.on(
|
||||
|
|
@ -137,10 +210,10 @@ export class CheckList extends Feature {
|
|||
this.opts = [];
|
||||
this.optsTxt = [];
|
||||
|
||||
let flt = this.checkListDiv[colIndex];
|
||||
let flt = this.containers[colIndex];
|
||||
let ul = createElm('ul', ['id', tf.fltIds[colIndex]],
|
||||
['colIndex', colIndex]);
|
||||
ul.className = this.checkListCssClass;
|
||||
ul.className = this.filterCssClass;
|
||||
addEvt(ul, 'change', (evt) => this.onChange(evt));
|
||||
|
||||
let rows = tf.tbl.rows;
|
||||
|
|
@ -286,16 +359,16 @@ export class CheckList extends Feature {
|
|||
let lbl = this.isCustom ? this.optsTxt[y] : val; //item text
|
||||
let li = createCheckItem(tf.fltIds[colIndex] + '_' + (y + chkCt),
|
||||
val, lbl);
|
||||
li.className = this.checkListItemCssClass;
|
||||
li.className = this.itemCssClass;
|
||||
|
||||
if (tf.linkedFilters && tf.disableExcludedOptions &&
|
||||
has(this.excludedOpts, matchCase(val, tf.caseSensitive),
|
||||
tf.caseSensitive)) {
|
||||
addClass(li, this.checkListItemDisabledCssClass);
|
||||
addClass(li, this.disabledItemCssClass);
|
||||
li.check.disabled = true;
|
||||
li.disabled = true;
|
||||
} else {
|
||||
addEvt(li.check, 'click', (evt) => this.optionClick(evt));
|
||||
addEvt(li.check, 'click', evt => this.optionClick(evt));
|
||||
}
|
||||
ul.appendChild(li);
|
||||
|
||||
|
|
@ -316,30 +389,30 @@ export class CheckList extends Feature {
|
|||
let chkCt = 1;
|
||||
let li0 = createCheckItem(tf.fltIds[colIndex] + '_0', '',
|
||||
tf.displayAllText);
|
||||
li0.className = this.checkListItemCssClass;
|
||||
li0.className = this.itemCssClass;
|
||||
ul.appendChild(li0);
|
||||
|
||||
addEvt(li0.check, 'click', (evt) => this.optionClick(evt));
|
||||
addEvt(li0.check, 'click', evt => this.optionClick(evt));
|
||||
|
||||
if (!this.enableCheckListResetFilter) {
|
||||
if (!this.enableResetOption) {
|
||||
li0.style.display = NONE;
|
||||
}
|
||||
|
||||
if (tf.enableEmptyOption) {
|
||||
let li1 = createCheckItem(tf.fltIds[colIndex] + '_1',
|
||||
tf.emOperator, tf.emptyText);
|
||||
li1.className = this.checkListItemCssClass;
|
||||
li1.className = this.itemCssClass;
|
||||
ul.appendChild(li1);
|
||||
addEvt(li1.check, 'click', (evt) => this.optionClick(evt));
|
||||
addEvt(li1.check, 'click', evt => this.optionClick(evt));
|
||||
chkCt++;
|
||||
}
|
||||
|
||||
if (tf.enableNonEmptyOption) {
|
||||
let li2 = createCheckItem(tf.fltIds[colIndex] + '_2', tf.nmOperator,
|
||||
tf.nonEmptyText);
|
||||
li2.className = this.checkListItemCssClass;
|
||||
li2.className = this.itemCssClass;
|
||||
ul.appendChild(li2);
|
||||
addEvt(li2.check, 'click', (evt) => this.optionClick(evt));
|
||||
addEvt(li2.check, 'click', evt => this.optionClick(evt));
|
||||
chkCt++;
|
||||
}
|
||||
return chkCt;
|
||||
|
|
@ -381,7 +454,7 @@ export class CheckList extends Feature {
|
|||
if (cChk) {
|
||||
cChk.checked = false;
|
||||
removeClass(n.childNodes[indSplit[u]],
|
||||
this.checkListSlcItemCssClass);
|
||||
this.selectedItemCssClass);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -402,8 +475,8 @@ export class CheckList extends Feature {
|
|||
}
|
||||
|
||||
if (li.nodeName === itemTag) {
|
||||
removeClass(n.childNodes[0], this.checkListSlcItemCssClass);
|
||||
addClass(li, this.checkListSlcItemCssClass);
|
||||
removeClass(n.childNodes[0], this.selectedItemCssClass);
|
||||
addClass(li, this.selectedItemCssClass);
|
||||
}
|
||||
} else { //removes values and indexes
|
||||
if (chkValue !== '') {
|
||||
|
|
@ -418,7 +491,7 @@ export class CheckList extends Feature {
|
|||
n.setAttribute('indexes', fltIndexes);
|
||||
}
|
||||
if (li.nodeName === itemTag) {
|
||||
removeClass(li, this.checkListSlcItemCssClass);
|
||||
removeClass(li, this.selectedItemCssClass);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -441,18 +514,27 @@ export class CheckList extends Feature {
|
|||
flt.setAttribute('indexes', '');
|
||||
|
||||
for (let k = 0; k < lisNb; k++) {
|
||||
let li = tag(flt, 'li')[k],
|
||||
lbl = tag(li, 'label')[0],
|
||||
chk = tag(li, 'input')[0],
|
||||
lblTxt = matchCase(getText(lbl), tf.caseSensitive);
|
||||
let li = tag(flt, 'li')[k];
|
||||
let lbl = tag(li, 'label')[0];
|
||||
let chk = tag(li, 'input')[0];
|
||||
let lblTxt = matchCase(getText(lbl), tf.caseSensitive);
|
||||
|
||||
if (lblTxt !== '' && has(values, lblTxt, tf.caseSensitive)) {
|
||||
chk.checked = true;
|
||||
this.setCheckListValues(chk);
|
||||
}
|
||||
else {
|
||||
chk.checked = false;
|
||||
this.setCheckListValues(chk);
|
||||
} else {
|
||||
// Check non-empty-text or empty-text option
|
||||
if (values.indexOf(tf.nmOperator) !== -1 &&
|
||||
lblTxt === matchCase(tf.nonEmptyText, tf.caseSensitive)) {
|
||||
chk.checked = true;
|
||||
}
|
||||
else if (values.indexOf(tf.emOperator) !== -1 &&
|
||||
lblTxt === matchCase(tf.emptyText, tf.caseSensitive)) {
|
||||
chk.checked = true;
|
||||
} else {
|
||||
chk.checked = false;
|
||||
}
|
||||
}
|
||||
this.setCheckListValues(chk);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -475,6 +557,9 @@ export class CheckList extends Feature {
|
|||
return values;
|
||||
}
|
||||
|
||||
/**
|
||||
* Destroy CheckList instance
|
||||
*/
|
||||
destroy() {
|
||||
this.emitter.off(
|
||||
['build-checklist-filter'],
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@ export class TableFilter {
|
|||
// configuration object
|
||||
let f = this.cfg;
|
||||
|
||||
/**
|
||||
* Event emitter instance
|
||||
* @type {Emitter}
|
||||
*/
|
||||
this.emitter = new Emitter();
|
||||
|
||||
//Start row et cols nb
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ var checkList = tf.feature('checkList');
|
|||
module('Sanity checks');
|
||||
test('CheckList component', function() {
|
||||
deepEqual(typeof checkList, 'object', 'CheckList instanciated');
|
||||
deepEqual(checkList.checkListDiv instanceof Array, true,
|
||||
'Type of checkListDiv property');
|
||||
deepEqual(checkList.containers instanceof Array, true,
|
||||
'Type of containers property');
|
||||
});
|
||||
|
||||
module('UI elements');
|
||||
|
|
@ -129,6 +129,44 @@ test('Can sort options', function() {
|
|||
);
|
||||
});
|
||||
|
||||
// Issue 238, empty and non-empty options cannot be selected
|
||||
module('Empty and non-empty options');
|
||||
test('Can select empty and non-empty options', function() {
|
||||
// setup
|
||||
tf.clearFilters();
|
||||
tf.destroy();
|
||||
tf = new TableFilter('demo', {
|
||||
base_path: '../dist/tablefilter/',
|
||||
col_2: 'checklist',
|
||||
col_3: 'checklist',
|
||||
enable_empty_option: true,
|
||||
enable_non_empty_option: true
|
||||
});
|
||||
tf.init();
|
||||
var checkList = tf.feature('checkList');
|
||||
var flt2 = tf.getFilterElement(2);
|
||||
var flt3 = tf.getFilterElement(3);
|
||||
|
||||
// act
|
||||
checkList.selectOptions(2, [tf.emOperator, tf.nmOperator]);
|
||||
checkList.selectOptions(3, [tf.emOperator, tf.nmOperator, '1.4']);
|
||||
|
||||
// assert
|
||||
deepEqual(checkList.getValues(2), [tf.emOperator, tf.nmOperator],
|
||||
'Filter 2 empty and non-empty options selected');
|
||||
notEqual(flt2.getAttribute('value').indexOf(tf.emOperator), -1,
|
||||
'Filter 2 options values attribute');
|
||||
notEqual(flt2.getAttribute('value').indexOf(tf.nmOperator), -1,
|
||||
'Filter 2 options values attribute');
|
||||
deepEqual(checkList.getValues(3), [tf.emOperator, tf.nmOperator, '1.4'],
|
||||
'Filter 3 options selected');
|
||||
notEqual(flt3.getAttribute('value').indexOf(tf.emOperator), -1,
|
||||
'Filter 3 options values attribute');
|
||||
notEqual(flt3.getAttribute('value').indexOf(tf.nmOperator), -1,
|
||||
'Filter 3 options values attribute');
|
||||
});
|
||||
|
||||
module('Tear down');
|
||||
test('TableFilter removed', function() {
|
||||
tf.destroy();
|
||||
deepEqual(id(tf.fltIds[3]), null, 'CheckList UL element');
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ tf.init();
|
|||
var flt1 = tf.getFilterElement(0);
|
||||
var flt2 = tf.getFilterElement(1);
|
||||
var flt3 = null;
|
||||
var flt3ContId = tf.feature('checkList').prfxCheckListDiv+'2_'+tf.id;
|
||||
var flt3ContId = tf.feature('checkList').prfx + '2_' + tf.id;
|
||||
var flt3Cont = id(flt3ContId);
|
||||
|
||||
function buildChecklist(tf, colIdx){
|
||||
var checkList = tf.feature('checkList');
|
||||
checkList.build(colIdx);
|
||||
checkList.checkListDiv[colIdx].onclick = null;
|
||||
checkList.checkListDiv[colIdx].title = '';
|
||||
checkList.containers[colIdx].onclick = null;
|
||||
checkList.containers[colIdx].title = '';
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ test('TableFilter re-initialised with grid layout', function() {
|
|||
flt1 = tf.getFilterElement(0);
|
||||
flt2 = tf.getFilterElement(1);
|
||||
flt3 = null;
|
||||
flt3ContId = tf.feature('checkList').prfxCheckListDiv+'2_'+tf.id;
|
||||
flt3ContId = tf.feature('checkList').prfx + '2_' + tf.id;
|
||||
flt3Cont = id(flt3ContId);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue