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

Finalised drop-down filter module

Browse source
This commit is contained in:
Max Guglielmi 2015-02-15 14:25:22 +11:00
parent 2ae6d7f2c3
commit c121f730af
11 changed files with 404 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TODO
View file

@ -1,4 +1,5 @@
- Initialise TableFilter object with a table DOM element - Initialise TableFilter object with a table DOM element
- Use DOM event listeners for DOM events - Use DOM event listeners for DOM events
- Refactor persistence using localStorage or cookie - Refactor persistence using localStorage or cookie
- Verify linked filters work as per production

2
dist/filtergrid.css vendored
View file

@ -1,6 +1,6 @@
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
- TableFilter stylesheet by Max Guglielmi - TableFilter stylesheet by Max Guglielmi
- (build date: Sat Feb 14 2015 19:57:20) - (build date: Sun Feb 15 2015 14:22:06)
- Edit below for your projects' needs - Edit below for your projects' needs
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/

10
dist/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

8
src-es6/modules/checkList.js
View file

@ -37,8 +37,8 @@ export class CheckList{
f.enable_checklist_reset_filter===false ? false : true; f.enable_checklist_reset_filter===false ? false : true;
this.isCustom = null; this.isCustom = null;
this.opts = []; this.opts = null;
this.optsTxt = []; this.optsTxt = null;
this.tf = tf; this.tf = tf;
} }
@ -77,11 +77,15 @@ export class CheckList{
var tf = this.tf; var tf = this.tf;
colIndex = parseInt(colIndex, 10); colIndex = parseInt(colIndex, 10);
this.opts = [];
this.optsTxt = [];
var divFltId = tf.prfxCheckListDiv+colIndex+'_'+tf.id; var divFltId = tf.prfxCheckListDiv+colIndex+'_'+tf.id;
if((!Dom.id(divFltId) && !isExternal) || if((!Dom.id(divFltId) && !isExternal) ||
(!Dom.id(extFltId) && isExternal)){ (!Dom.id(extFltId) && isExternal)){
return; return;
} }
var flt = !isExternal ? this.checkListDiv[colIndex] : Dom.id(extFltId); var flt = !isExternal ? this.checkListDiv[colIndex] : Dom.id(extFltId);
var ul = Dom.create( var ul = Dom.create(
'ul', ['id', tf.fltIds[colIndex]], ['colIndex', colIndex]); 'ul', ['id', tf.fltIds[colIndex]], ['colIndex', colIndex]);

84
src-es6/modules/dropdown.js
View file

@ -2,7 +2,6 @@ import {Dom} from '../dom';
import {Arr as array} from '../array'; import {Arr as array} from '../array';
import {Str} from '../string'; import {Str} from '../string';
import {Sort} from '../sort'; import {Sort} from '../sort';
import {Event} from '../event';
export class Dropdown{ export class Dropdown{
@ -14,11 +13,9 @@ export class Dropdown{
// Configuration object // Configuration object
var f = tf.fObj; var f = tf.fObj;
this.enableSlcResetFilter = !f.enable_slc_reset_filter ? false : true; this.enableSlcResetFilter = f.enable_slc_reset_filter ? false : true;
//defines empty option text //defines empty option text
this.nonEmptyText = f.non_empty_text || '(Non empty)'; this.nonEmptyText = f.non_empty_text || '(Non empty)';
//enables/disables onChange event on combo-box
this.onSlcChange = f.on_change===false ? false : true;
//sets select filling method: 'innerHTML' or 'createElement' //sets select filling method: 'innerHTML' or 'createElement'
this.slcFillingMethod = f.slc_filling_method || 'createElement'; this.slcFillingMethod = f.slc_filling_method || 'createElement';
//IE only, tooltip text appearing on select before it is populated //IE only, tooltip text appearing on select before it is populated
@ -27,30 +24,50 @@ export class Dropdown{
//tooltip text appearing on multiple select //tooltip text appearing on multiple select
this.multipleSlcTooltip = f.multiple_slc_tooltip || this.multipleSlcTooltip = f.multiple_slc_tooltip ||
'Use Ctrl key for multiple selections'; 'Use Ctrl key for multiple selections';
this.hasCustomSlcOptions = types.isObj(f.custom_slc_options) ?
true : false;
this.customSlcOptions = types.isArray(f.custom_slc_options) ?
f.custom_slc_options : null;
this.isCustom = null; this.isCustom = null;
this.opts = []; this.opts = null;
this.optsTxt = []; this.optsTxt = null;
this.slcInnerHtml = ''; this.slcInnerHtml = null;
this.tf = tf; this.tf = tf;
} }
/** /**
* Build checklist UI * Build drop-down filter UI asynchronously
* @param {Number} colIndex Column index
* @param {Boolean} isRefreshed Enable linked refresh behaviour
* @param {Boolean} isExternal Render in external container
* @param {String} extSlcId External container id
*/
build(colIndex, isRefreshed, isExternal, extSlcId){
var tf = this.tf;
tf.EvtManager(
tf.Evt.name.dropdown,
{
slcIndex: colIndex,
slcRefreshed: isRefreshed,
slcExternal: isExternal,
slcId: extSlcId
}
);
}
/**
* Build drop-down filter UI
* @param {Number} colIndex Column index * @param {Number} colIndex Column index
* @param {Boolean} isRefreshed Enable linked refresh behaviour * @param {Boolean} isRefreshed Enable linked refresh behaviour
* @param {Boolean} isExternal Render in external container * @param {Boolean} isExternal Render in external container
* @param {String} extFltId External container id * @param {String} extSlcId External container id
*/ */
_build(colIndex, isRefreshed=false, isExternal=false, extFltId=null){ _build(colIndex, isRefreshed=false, isExternal=false, extSlcId=null){
var tf = this.tf; var tf = this.tf;
colIndex = parseInt(colIndex, 10); colIndex = parseInt(colIndex, 10);
this.opts = [];
this.optsTxt = [];
this.slcInnerHtml = '';
var slcId = tf.fltIds[colIndex]; var slcId = tf.fltIds[colIndex];
if((!Dom.id(slcId) && !isExternal) || if((!Dom.id(slcId) && !isExternal) ||
(!Dom.id(extSlcId) && isExternal)){ (!Dom.id(extSlcId) && isExternal)){
@ -62,8 +79,8 @@ export class Dropdown{
fillMethod = Str.lower(this.slcFillingMethod); fillMethod = Str.lower(this.slcFillingMethod);
//custom select test //custom select test
this.isCustom = (this.hasCustomSlcOptions && this.isCustom = (tf.hasCustomSlcOptions &&
array.has(this.customSlcOptions.cols, colIndex)); array.has(tf.customSlcOptions.cols, colIndex));
//custom selects text //custom selects text
var activeFlt; var activeFlt;
@ -73,14 +90,14 @@ export class Dropdown{
} }
/*** remember grid values ***/ /*** remember grid values ***/
var flts_values = [], fltArr = []; var fltsValues = [], fltArr = [];
if(tf.rememberGridValues){ if(tf.rememberGridValues){
flts_values = tf.Cpt.store.getFilterValues(tf.fltsValuesCookie); fltsValues = tf.Cpt.store.getFilterValues(tf.fltsValuesCookie);
if(flts_values && !Str.isEmpty(flts_values.toString())){ if(fltsValues && !Str.isEmpty(fltsValues.toString())){
if(this.isCustom){ if(this.isCustom){
fltArr.push(flts_values[colIndex]); fltArr.push(fltsValues[colIndex]);
} else { } else {
fltArr = flts_values[colIndex].split(' '+tf.orOperator+' '); fltArr = fltsValues[colIndex].split(' '+tf.orOperator+' ');
} }
} }
} }
@ -107,8 +124,7 @@ export class Dropdown{
if(nchilds !== tf.nbCells || this.isCustom){ if(nchilds !== tf.nbCells || this.isCustom){
continue; continue;
} }
// checks if row has exact cell #
// if(nchilds === this.nbCells && !this.isCustom){
// this loop retrieves cell data // this loop retrieves cell data
for(var j=0; j<nchilds; j++){ for(var j=0; j<nchilds; j++){
if((colIndex===j && if((colIndex===j &&
@ -122,7 +138,7 @@ export class Dropdown{
((activeFlt===undefined || activeFlt==colIndex) || ((activeFlt===undefined || activeFlt==colIndex) ||
(activeFlt!=colIndex && (activeFlt!=colIndex &&
array.has(tf.validRowsIndex, k) ))) ))){ array.has(tf.validRowsIndex, k) ))) ))){
var cell_data = this.GetCellData(j, cell[j]), var cell_data = tf.GetCellData(j, cell[j]),
//Vary Peter's patch //Vary Peter's patch
cell_string = Str.matchCase(cell_data, matchCase); cell_string = Str.matchCase(cell_data, matchCase);
@ -145,7 +161,6 @@ export class Dropdown{
} }
}//if colIndex==j }//if colIndex==j
}//for j }//for j
// }//if
}//for k }//for k
//Retrieves custom values //Retrieves custom values
@ -209,17 +224,20 @@ export class Dropdown{
} }
//populates drop-down //populates drop-down
this.addOptions(colIndex, slc, excludedOpts, fltArr); this.addOptions(
colIndex, slc, isRefreshed, excludedOpts, fltsValues, fltArr);
} }
/** /**
* Add drop-down options * Add drop-down options
* @param {Number} colIndex Column index * @param {Number} colIndex Column index
* @param {Object} slc Select Dom element * @param {Object} slc Select Dom element
* @param {Array} excludedOpts Array of excluded options * @param {Boolean} isRefreshed Enable linked refresh behaviour
* @param {Array} fltArr Collection of persisted filter values * @param {Array} excludedOpts Array of excluded options
* @param {Array} fltsValues Collection of persisted filter values
* @param {Array} fltArr Collection of persisted filter values
*/ */
addOptions(colIndex, slc, excludedOpts, fltArr){ addOptions(colIndex, slc, isRefreshed, excludedOpts, fltsValues, fltArr){
var tf = this.tf, var tf = this.tf,
fillMethod = Str.lower(this.slcFillingMethod), fillMethod = Str.lower(this.slcFillingMethod),
slcValue = slc.value; slcValue = slc.value;
@ -262,8 +280,8 @@ export class Dropdown{
opt = Dom.createOpt( opt = Dom.createOpt(
lbl, lbl,
val, val,
(flts_values[colIndex]!==' ' && (fltsValues[colIndex]!==' ' &&
val===flts_values[colIndex]) ? true : false val===fltsValues[colIndex]) ? true : false
); );
} else { } else {
opt = Dom.createOpt( opt = Dom.createOpt(

580
src/core.js
View file

@ -281,8 +281,6 @@ function TableFilter(id) {
/*** select filter's customisation and behaviours ***/ /*** select filter's customisation and behaviours ***/
//defines 1st option text //defines 1st option text
this.displayAllText = f.display_all_text || ''; this.displayAllText = f.display_all_text || '';
// this.enableSlcResetFilter = f.enable_slc_reset_filter===false ?
// false : true;
//enables/disables empty option in combo-box filters //enables/disables empty option in combo-box filters
this.enableEmptyOption = f.enable_empty_option===true ? true : false; this.enableEmptyOption = f.enable_empty_option===true ? true : false;
//defines empty option text //defines empty option text
@ -292,8 +290,8 @@ function TableFilter(id) {
true : false; true : false;
//defines empty option text //defines empty option text
this.nonEmptyText = f.non_empty_text || '(Non empty)'; this.nonEmptyText = f.non_empty_text || '(Non empty)';
// //enables/disables onChange event on combo-box //enables/disables onChange event on combo-box
// this.onSlcChange = f.on_change===false ? false : true; this.onSlcChange = f.on_change===false ? false : true;
//enables/disables select options sorting //enables/disables select options sorting
this.sortSlc = f.sort_select===false ? false : true; this.sortSlc = f.sort_select===false ? false : true;
//enables/disables ascending numeric options sorting //enables/disables ascending numeric options sorting
@ -302,8 +300,6 @@ function TableFilter(id) {
//enables/disables descending numeric options sorting //enables/disables descending numeric options sorting
this.isSortNumDesc = f.sort_num_desc===true ? true : false; this.isSortNumDesc = f.sort_num_desc===true ? true : false;
this.sortNumDesc = this.isSortNumDesc ? f.sort_num_desc : null; this.sortNumDesc = this.isSortNumDesc ? f.sort_num_desc : null;
// //sets select filling method: 'innerHTML' or 'createElement'
// this.slcFillingMethod = f.slc_filling_method || 'createElement';
//enabled selects are populated on demand //enabled selects are populated on demand
this.fillSlcOnDemand = f.fill_slc_on_demand===true ? true : false; this.fillSlcOnDemand = f.fill_slc_on_demand===true ? true : false;
// //IE only, tooltip text appearing on select before it is populated // //IE only, tooltip text appearing on select before it is populated
@ -312,16 +308,10 @@ function TableFilter(id) {
// //tooltip text appearing on multiple select // //tooltip text appearing on multiple select
// this.multipleSlcTooltip = f.multiple_slc_tooltip || // this.multipleSlcTooltip = f.multiple_slc_tooltip ||
// 'Use Ctrl key for multiple selections'; // 'Use Ctrl key for multiple selections';
// this.hasCustomSlcOptions = types.isObj(f.custom_slc_options) ? this.hasCustomSlcOptions = types.isObj(f.custom_slc_options) ?
// true : false; true : false;
// this.customSlcOptions = types.isArray(f.custom_slc_options) ? this.customSlcOptions = types.isArray(f.custom_slc_options) ?
// f.custom_slc_options : null; f.custom_slc_options : null;
// //calls function before col operation
// this.onBeforeOperation = types.isFn(f.on_before_operation) ?
// f.on_before_operation : null;
// //calls function after col operation
// this.onAfterOperation = types.isFn(f.on_after_operation) ?
// f.on_after_operation : null;
/*** Filter operators ***/ /*** Filter operators ***/
this.rgxOperator = f.regexp_operator || 'rgx:'; this.rgxOperator = f.regexp_operator || 'rgx:';
@ -634,7 +624,8 @@ function TableFilter(id) {
store: null, store: null,
highlightKeywords: null, highlightKeywords: null,
paging: null, paging: null,
checkList: null checkList: null,
dropdown: null
}; };
/*** TF events ***/ /*** TF events ***/
@ -642,7 +633,7 @@ function TableFilter(id) {
this.Evt = { this.Evt = {
name: { name: {
filter: 'Filter', filter: 'Filter',
populateselect: 'Populate', dropdown: 'dropdown',
checklist: 'checkList', checklist: 'checkList',
changepage: 'changePage', changepage: 'changePage',
clear: 'Clear', clear: 'Clear',
@ -781,8 +772,8 @@ function TableFilter(id) {
// select is populated when element has focus // select is populated when element has focus
if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){ if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){
var ct = this.getAttribute('ct'); var ct = this.getAttribute('ct');
o.PopulateSelect(ct); // o.PopulateSelect(ct);
if(!hlp.isIE()){ this.setAttribute('filled','1'); } o.Cpt.dropdown._build(ct);
} }
if(o.popUpFilters){ if(o.popUpFilters){
evt.cancel(_evt); evt.cancel(_evt);
@ -813,7 +804,6 @@ function TableFilter(id) {
_OnCheckListClick: function() { _OnCheckListClick: function() {
if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){ if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){
var ct = this.getAttribute('ct'); var ct = this.getAttribute('ct');
// o.PopulateCheckList(ct);
o.Cpt.checkList._build(ct); o.Cpt.checkList._build(ct);
o.Cpt.checkList.checkListDiv[ct].onclick = null; o.Cpt.checkList.checkListDiv[ct].onclick = null;
o.Cpt.checkList.checkListDiv[ct].title = ''; o.Cpt.checkList.checkListDiv[ct].title = '';
@ -999,16 +989,23 @@ TableFilter.prototype = {
inpclass = this.singleFltCssClass; inpclass = this.singleFltCssClass;
} }
//selects //drop-down filters
if(col===this.fltTypeSlc || if(col===this.fltTypeSlc || col===this.fltTypeMulti){
col===this.fltTypeMulti){ var dropdown;
if(!this.Cpt.dropdown){
var Dropdown = require('modules/dropdown').Dropdown;
dropdown = new Dropdown(this);
}
this.Cpt.dropdown = dropdown;
var slc = dom.create(this.fltTypeSlc, var slc = dom.create(this.fltTypeSlc,
['id',this.prfxFlt+i+'_'+this.id], ['id', this.prfxFlt+i+'_'+this.id],
['ct',i], ['filled','0']); ['ct', i], ['filled', '0']
);
if(col===this.fltTypeMulti){ if(col===this.fltTypeMulti){
slc.multiple = this.fltTypeMulti; slc.multiple = this.fltTypeMulti;
slc.title = this.multipleSlcTooltip; slc.title = dropdown.multipleSlcTooltip;
} }
slc.className = str.lower(col)===this.fltTypeSlc ? slc.className = str.lower(col)===this.fltTypeSlc ?
inpclass : this.fltMultiCssClass;// for ie<=6 inpclass : this.fltMultiCssClass;// for ie<=6
@ -1024,25 +1021,33 @@ TableFilter.prototype = {
this.fltIds.push(this.prfxFlt+i+'_'+this.id); this.fltIds.push(this.prfxFlt+i+'_'+this.id);
if(!this.fillSlcOnDemand){ if(!this.fillSlcOnDemand){
this._PopulateSelect(i); // this._PopulateSelect(i);
dropdown._build(i);
} }
slc.onkeypress = this.Evt._DetectKey; // slc.onkeypress = this.Evt._DetectKey;
slc.onchange = this.Evt._OnSlcChange; evt.add(slc, 'keypress', this.Evt._DetectKey);
slc.onfocus = this.Evt._OnSlcFocus; // slc.onchange = this.Evt._OnSlcChange;
slc.onblur = this.Evt._OnSlcBlur; evt.add(slc, 'change', this.Evt._OnSlcChange);
// slc.onfocus = this.Evt._OnSlcFocus;
evt.add(slc, 'focus', this.Evt._OnSlcFocus);
// slc.onblur = this.Evt._OnSlcBlur;
evt.add(slc, 'blur', this.Evt._OnSlcBlur);
//1st option is created here since PopulateSelect isn't //1st option is created here since PopulateSelect isn't
//invoked //invoked
if(this.fillSlcOnDemand){ if(this.fillSlcOnDemand){
var opt0 = dom.createOpt(this.displayAllText,''); var opt0 = dom.createOpt(this.displayAllText, '');
slc.appendChild(opt0); slc.appendChild(opt0);
} }
} }
// checklist // checklist
else if(col===this.fltTypeCheckList){ else if(col===this.fltTypeCheckList){
var CheckList = require('modules/checkList').CheckList; if(!this.Cpt.checkList){
var CheckList =
require('modules/checkList').CheckList;
this.Cpt.checkList = new CheckList(this); this.Cpt.checkList = new CheckList(this);
}
var divCont = dom.create('div', var divCont = dom.create('div',
['id',this.prfxCheckListDiv+i+'_'+this.id], ['id',this.prfxCheckListDiv+i+'_'+this.id],
@ -1058,16 +1063,13 @@ TableFilter.prototype = {
fltcell.appendChild(divCont); fltcell.appendChild(divCont);
} }
// this.checkListDiv[i] = divCont;
this.Cpt.checkList.checkListDiv[i] = divCont; this.Cpt.checkList.checkListDiv[i] = divCont;
this.fltIds.push(this.prfxFlt+i+'_'+this.id); this.fltIds.push(this.prfxFlt+i+'_'+this.id);
if(!this.fillSlcOnDemand){ if(!this.fillSlcOnDemand){
// this._PopulateCheckList(i);
this.Cpt.checkList._build(i); this.Cpt.checkList._build(i);
} }
if(this.fillSlcOnDemand){ if(this.fillSlcOnDemand){
//divCont.onclick = this.Evt._OnCheckListClick;
evt.add( evt.add(
divCont, 'click', this.Evt._OnCheckListClick); divCont, 'click', this.Evt._OnCheckListClick);
divCont.appendChild( divCont.appendChild(
@ -1075,7 +1077,6 @@ TableFilter.prototype = {
this.Cpt.checkList.activateCheckListTxt)); this.Cpt.checkList.activateCheckListTxt));
} }
//divCont.onclick = this.Evt._OnCheckListFocus;
evt.add(divCont, 'click', this.Evt._OnCheckListFocus); evt.add(divCont, 'click', this.Evt._OnCheckListFocus);
} }
@ -1090,7 +1091,7 @@ TableFilter.prototype = {
this.inpWatermark[i] : this.inpWatermark; this.inpWatermark[i] : this.inpWatermark;
} }
inp.className = inpclass;// for ie<=6 inp.className = inpclass;// for ie<=6
if(this.inpWatermark!==''){ if(this.inpWatermark !== ''){
//watermark css class //watermark css class
dom.addClass(inp, this.inpWatermarkCssClass); dom.addClass(inp, this.inpWatermarkCssClass);
} }
@ -1237,11 +1238,14 @@ TableFilter.prototype = {
o._Filter(); o._Filter();
} }
break; break;
case o.Evt.name.populateselect: case o.Evt.name.dropdown:
if(o.refreshFilters){ if(o.refreshFilters){
o._PopulateSelect(slcIndex, true); // o._PopulateSelect(slcIndex, true);
o.Cpt.dropdown._build(slcIndex, true);
} else { } else {
o._PopulateSelect(slcIndex, false, slcExternal, slcId); // o._PopulateSelect(slcIndex, false, slcExternal, slcId);
o.Cpt.dropdown._build(
slcIndex, false, slcExternal, slcId);
} }
break; break;
case o.Evt.name.checklist: case o.Evt.name.checklist:
@ -2142,265 +2146,265 @@ TableFilter.prototype = {
} }
}, },
PopulateSelect: function(colIndex,isExternal,extSlcId){ // PopulateSelect: function(colIndex,isExternal,extSlcId){
this.EvtManager( // this.EvtManager(
this.Evt.name.populateselect, // this.Evt.name.dropdown,
{ slcIndex:colIndex, slcExternal:isExternal, slcId:extSlcId } // { slcIndex:colIndex, slcExternal:isExternal, slcId:extSlcId }
); // );
}, // },
/*==================================================== /*====================================================
- populates drop-down filters - populates drop-down filters
=====================================================*/ =====================================================*/
_PopulateSelect: function(colIndex,isRefreshed,isExternal,extSlcId) { // _PopulateSelect: function(colIndex,isRefreshed,isExternal,extSlcId) {
isExternal = isExternal===undefined ? false : isExternal; // isExternal = isExternal===undefined ? false : isExternal;
var slcId = this.fltIds[colIndex]; // var slcId = this.fltIds[colIndex];
if((!dom.id(slcId) && !isExternal) || // if((!dom.id(slcId) && !isExternal) ||
(!dom.id(extSlcId) && isExternal)){ // (!dom.id(extSlcId) && isExternal)){
return; // return;
} // }
var slc = !isExternal ? dom.id(slcId) : dom.id(extSlcId), // var slc = !isExternal ? dom.id(slcId) : dom.id(extSlcId),
o = this, // o = this,
row = this.tbl.rows, // row = this.tbl.rows,
matchCase = this.matchCase, // matchCase = this.matchCase,
fillMethod = str.lower(this.slcFillingMethod), // fillMethod = str.lower(this.slcFillingMethod),
optArray = [], // optArray = [],
slcInnerHtml = '', // slcInnerHtml = '',
opt0, // opt0,
//custom select test // //custom select test
isCustomSlc = (this.hasCustomSlcOptions && // isCustomSlc = (this.hasCustomSlcOptions &&
array.has(this.customSlcOptions.cols, colIndex)); // array.has(this.customSlcOptions.cols, colIndex));
//custom selects text // //custom selects text
var optTxt = [], // var optTxt = [],
activeFlt; // activeFlt;
if(isRefreshed && this.activeFilterId){ // if(isRefreshed && this.activeFilterId){
activeFlt = this.activeFilterId.split('_')[0]; // activeFlt = this.activeFilterId.split('_')[0];
activeFlt = activeFlt.split(this.prfxFlt)[1]; // activeFlt = activeFlt.split(this.prfxFlt)[1];
} // }
/*** remember grid values ***/ // /*** remember grid values ***/
var flts_values = [], fltArr = []; // var flts_values = [], fltArr = [];
if(this.rememberGridValues){ // if(this.rememberGridValues){
// flts_values = cookie.valueToArray( // // flts_values = cookie.valueToArray(
// this.fltsValuesCookie, this.separator); // // this.fltsValuesCookie, this.separator);
flts_values = this.Cpt.store.getFilterValues(this.fltsValuesCookie); // flts_values = this.Cpt.store.getFilterValues(this.fltsValuesCookie);
if(flts_values && !str.isEmpty(flts_values.toString())){ // if(flts_values && !str.isEmpty(flts_values.toString())){
if(isCustomSlc){ // if(isCustomSlc){
fltArr.push(flts_values[colIndex]); // fltArr.push(flts_values[colIndex]);
} else { // } else {
fltArr = flts_values[colIndex].split(' '+o.orOperator+' '); // fltArr = flts_values[colIndex].split(' '+o.orOperator+' ');
} // }
} // }
} // }
var excludedOpts = null, // var excludedOpts = null,
filteredDataCol = null; // filteredDataCol = null;
if(isRefreshed && this.disableExcludedOptions){ // if(isRefreshed && this.disableExcludedOptions){
excludedOpts = []; // excludedOpts = [];
filteredDataCol = []; // filteredDataCol = [];
} // }
for(var k=this.refRow; k<this.nbRows; k++){ // for(var k=this.refRow; k<this.nbRows; k++){
// always visible rows don't need to appear on selects as always // // always visible rows don't need to appear on selects as always
// valid // // valid
if(this.hasVisibleRows && array.has(this.visibleRows, k) && // if(this.hasVisibleRows && array.has(this.visibleRows, k) &&
!this.paging){ // !this.paging){
continue; // continue;
} // }
var cell = row[k].cells, // var cell = row[k].cells,
nchilds = cell.length; // nchilds = cell.length;
// checks if row has exact cell # // // checks if row has exact cell #
if(nchilds === this.nbCells && !isCustomSlc){ // if(nchilds === this.nbCells && !isCustomSlc){
// this loop retrieves cell data // // this loop retrieves cell data
for(var j=0; j<nchilds; j++){ // for(var j=0; j<nchilds; j++){
if((colIndex===j && // if((colIndex===j &&
(!isRefreshed || // (!isRefreshed ||
(isRefreshed && this.disableExcludedOptions))) || // (isRefreshed && this.disableExcludedOptions))) ||
(colIndex==j && isRefreshed && // (colIndex==j && isRefreshed &&
((row[k].style.display === '' && !this.paging) || // ((row[k].style.display === '' && !this.paging) ||
(this.paging && (!this.validRowsIndex || // (this.paging && (!this.validRowsIndex ||
(this.validRowsIndex && // (this.validRowsIndex &&
array.has(this.validRowsIndex, k))) && // array.has(this.validRowsIndex, k))) &&
((activeFlt===undefined || activeFlt==colIndex) || // ((activeFlt===undefined || activeFlt==colIndex) ||
(activeFlt!=colIndex && // (activeFlt!=colIndex &&
array.has(this.validRowsIndex, k) ))) ))){ // array.has(this.validRowsIndex, k) ))) ))){
var cell_data = this.GetCellData(j, cell[j]), // var cell_data = this.GetCellData(j, cell[j]),
//Vary Peter's patch // //Vary Peter's patch
cell_string = str.matchCase(cell_data, matchCase); // cell_string = str.matchCase(cell_data, matchCase);
// checks if celldata is already in array // // checks if celldata is already in array
if(!array.has(optArray, cell_string, matchCase)){ // if(!array.has(optArray, cell_string, matchCase)){
optArray.push(cell_data); // optArray.push(cell_data);
} // }
if(isRefreshed && this.disableExcludedOptions){ // if(isRefreshed && this.disableExcludedOptions){
var filteredCol = filteredDataCol[j]; // var filteredCol = filteredDataCol[j];
if(!filteredCol){ // if(!filteredCol){
filteredCol = this.GetFilteredDataCol(j); // filteredCol = this.GetFilteredDataCol(j);
} // }
if(!array.has(filteredCol,cell_string, matchCase) && // if(!array.has(filteredCol,cell_string, matchCase) &&
!array.has( // !array.has(
excludedOpts,cell_string,matchCase) && // excludedOpts,cell_string,matchCase) &&
!this.isFirstLoad){ // !this.isFirstLoad){
excludedOpts.push(cell_data); // excludedOpts.push(cell_data);
} // }
} // }
}//if colIndex==j // }//if colIndex==j
}//for j // }//for j
}//if // }//if
}//for k // }//for k
//Retrieves custom values // //Retrieves custom values
if(isCustomSlc){ // if(isCustomSlc){
var customValues = this.__getCustomValues(colIndex); // var customValues = this.__getCustomValues(colIndex);
optArray = customValues[0]; // optArray = customValues[0];
optTxt = customValues[1]; // optTxt = customValues[1];
} // }
if(this.sortSlc && !isCustomSlc){ // if(this.sortSlc && !isCustomSlc){
if (!matchCase){ // if (!matchCase){
optArray.sort(Sort.ignoreCase); // optArray.sort(Sort.ignoreCase);
if(excludedOpts){ // if(excludedOpts){
excludedOpts.sort(Sort.ignoreCase); // excludedOpts.sort(Sort.ignoreCase);
} // }
} else { // } else {
optArray.sort(); // optArray.sort();
if(excludedOpts){ excludedOpts.sort(); } // if(excludedOpts){ excludedOpts.sort(); }
} // }
} // }
//asc sort // //asc sort
if(this.sortNumAsc && array.has(this.sortNumAsc, colIndex)){ // if(this.sortNumAsc && array.has(this.sortNumAsc, colIndex)){
try{ // try{
optArray.sort( numSortAsc ); // optArray.sort( numSortAsc );
if(excludedOpts){ // if(excludedOpts){
excludedOpts.sort( numSortAsc ); // excludedOpts.sort( numSortAsc );
} // }
if(isCustomSlc){ // if(isCustomSlc){
optTxt.sort( numSortAsc ); // optTxt.sort( numSortAsc );
} // }
} catch(e) { // } catch(e) {
optArray.sort(); // optArray.sort();
if(excludedOpts){ // if(excludedOpts){
excludedOpts.sort(); // excludedOpts.sort();
} // }
if(isCustomSlc){ // if(isCustomSlc){
optTxt.sort(); // optTxt.sort();
} // }
}//in case there are alphanumeric values // }//in case there are alphanumeric values
} // }
//desc sort // //desc sort
if(this.sortNumDesc && array.has(this.sortNumDesc, colIndex)){ // if(this.sortNumDesc && array.has(this.sortNumDesc, colIndex)){
try{ // try{
optArray.sort( numSortDesc ); // optArray.sort( numSortDesc );
if(excludedOpts){ // if(excludedOpts){
excludedOpts.sort( numSortDesc ); // excludedOpts.sort( numSortDesc );
} // }
if(isCustomSlc){ // if(isCustomSlc){
optTxt.sort( numSortDesc ); // optTxt.sort( numSortDesc );
} // }
} catch(e) { // } catch(e) {
optArray.sort(); // optArray.sort();
if(excludedOpts){ excludedOpts.sort(); } // if(excludedOpts){ excludedOpts.sort(); }
if(isCustomSlc){ // if(isCustomSlc){
optTxt.sort(); // optTxt.sort();
} // }
}//in case there are alphanumeric values // }//in case there are alphanumeric values
} // }
AddOpts();//populates drop-down // AddOpts();//populates drop-down
// adds 1st option // // adds 1st option
function AddOpt0(){ // function AddOpt0(){
if(fillMethod === 'innerhtml'){ // if(fillMethod === 'innerhtml'){
slcInnerHtml +='<option value="">'+o.displayAllText+'</option>'; // slcInnerHtml +='<option value="">'+o.displayAllText+'</option>';
} // }
else { // else {
var opt0 = dom.createOpt( // var opt0 = dom.createOpt(
(!o.enableSlcResetFilter ? '' : o.displayAllText),''); // (!o.enableSlcResetFilter ? '' : o.displayAllText),'');
if(!o.enableSlcResetFilter){ // if(!o.enableSlcResetFilter){
opt0.style.display = 'none'; // opt0.style.display = 'none';
} // }
slc.appendChild(opt0); // slc.appendChild(opt0);
if(o.enableEmptyOption){ // if(o.enableEmptyOption){
var opt1 = dom.createOpt(o.emptyText,o.emOperator); // var opt1 = dom.createOpt(o.emptyText,o.emOperator);
slc.appendChild(opt1); // slc.appendChild(opt1);
} // }
if(o.enableNonEmptyOption){ // if(o.enableNonEmptyOption){
var opt2 = dom.createOpt(o.nonEmptyText,o.nmOperator); // var opt2 = dom.createOpt(o.nonEmptyText,o.nmOperator);
slc.appendChild(opt2); // slc.appendChild(opt2);
} // }
} // }
} // }
// populates select // // populates select
function AddOpts(){ // function AddOpts(){
var slcValue = slc.value; // var slcValue = slc.value;
slc.innerHTML = ''; // slc.innerHTML = '';
AddOpt0(); // AddOpt0();
for(var y=0; y<optArray.length; y++){ // for(var y=0; y<optArray.length; y++){
if(optArray[y]===''){ // if(optArray[y]===''){
continue; // continue;
} // }
var val = optArray[y]; //option value // var val = optArray[y]; //option value
var lbl = isCustomSlc ? optTxt[y] : val; //option text // var lbl = isCustomSlc ? optTxt[y] : val; //option text
var isDisabled = false; // var isDisabled = false;
if(isRefreshed && o.disableExcludedOptions && // if(isRefreshed && o.disableExcludedOptions &&
array.has(excludedOpts, // array.has(excludedOpts,
str.matchCase(val, o.matchCase), o.matchCase)){ // str.matchCase(val, o.matchCase), o.matchCase)){
isDisabled = true; // isDisabled = true;
} // }
if(fillMethod === 'innerhtml'){ // if(fillMethod === 'innerhtml'){
var slcAttr = ''; // var slcAttr = '';
if(o.fillSlcOnDemand && slcValue==optArray[y]){ // if(o.fillSlcOnDemand && slcValue==optArray[y]){
slcAttr = 'selected="selected"'; // slcAttr = 'selected="selected"';
} // }
slcInnerHtml += '<option value="'+val+'" ' + slcAttr + // slcInnerHtml += '<option value="'+val+'" ' + slcAttr +
(isDisabled ? 'disabled="disabled"' : '')+ '>' + // (isDisabled ? 'disabled="disabled"' : '')+ '>' +
lbl+'</option>'; // lbl+'</option>';
} else { // } else {
var opt; // var opt;
//fill select on demand // //fill select on demand
if(o.fillSlcOnDemand && slcValue==optArray[y] && // if(o.fillSlcOnDemand && slcValue==optArray[y] &&
o['col'+colIndex]===o.fltTypeSlc){ // o['col'+colIndex]===o.fltTypeSlc){
opt = dom.createOpt(lbl, val, true); // opt = dom.createOpt(lbl, val, true);
} else { // } else {
if(o['col'+colIndex]!=o.fltTypeMulti){ // if(o['col'+colIndex]!=o.fltTypeMulti){
opt = dom.createOpt( // opt = dom.createOpt(
lbl, // lbl,
val, // val,
(flts_values[colIndex]!==' ' && // (flts_values[colIndex]!==' ' &&
val==flts_values[colIndex]) ? true : false // val==flts_values[colIndex]) ? true : false
); // );
} else { // } else {
opt = dom.createOpt( // opt = dom.createOpt(
lbl, // lbl,
val, // val,
(array.has(fltArr, // (array.has(fltArr,
str.matchCase(optArray[y],o.matchCase), // str.matchCase(optArray[y],o.matchCase),
o.matchCase) || // o.matchCase) ||
fltArr.toString().indexOf(val)!== -1) ? // fltArr.toString().indexOf(val)!== -1) ?
true : false // true : false
); // );
} // }
} // }
if(isDisabled){ // if(isDisabled){
opt.disabled = true; // opt.disabled = true;
} // }
slc.appendChild(opt); // slc.appendChild(opt);
} // }
}// for y // }// for y
if(fillMethod === 'innerhtml'){ // if(fillMethod === 'innerhtml'){
slc.innerHTML += slcInnerHtml; // slc.innerHTML += slcInnerHtml;
} // }
slc.setAttribute('filled','1'); // slc.setAttribute('filled','1');
}// fn AddOpt // }// fn AddOpt
}, // },
/*==================================================== /*====================================================
- IE bug: it seems there is no way to make - IE bug: it seems there is no way to make
@ -3782,7 +3786,7 @@ TableFilter.prototype = {
var s = searcharg.split(' '+this.orOperator+' '), var s = searcharg.split(' '+this.orOperator+' '),
ct = 0; //keywords counter ct = 0; //keywords counter
for(var j=0; j<slc.options.length; j++){ for(var j=0; j<slc.options.length; j++){
if(s===''){ if(s==='' || s[0]===''){
slc.options[j].selected = false; slc.options[j].selected = false;
} }
if(slc.options[j].value===''){ if(slc.options[j].value===''){
@ -3884,7 +3888,7 @@ TableFilter.prototype = {
this.onBeforeReset.call(null, this, this.GetFiltersValue()); this.onBeforeReset.call(null, this, this.GetFiltersValue());
} }
for(var i=0; i<this.fltIds.length; i++){ for(var i=0; i<this.fltIds.length; i++){
this.SetFilterValue(i,''); this.SetFilterValue(i, '');
} }
if(this.refreshFilters){ if(this.refreshFilters){
this.activeFilterId = ''; this.activeFilterId = '';
@ -3960,7 +3964,6 @@ TableFilter.prototype = {
slcSelectedValue === this.displayAllText ){ slcSelectedValue === this.displayAllText ){
if(array.has(slcA3, slcIndex[i])){ if(array.has(slcA3, slcIndex[i])){
// this.checkListDiv[slcIndex[i]].innerHTML = '';
this.Cpt.checkList.checkListDiv[ this.Cpt.checkList.checkListDiv[
slcIndex[i]].innerHTML = ''; slcIndex[i]].innerHTML = '';
} else { } else {
@ -3969,17 +3972,17 @@ TableFilter.prototype = {
//1st option needs to be inserted //1st option needs to be inserted
if(this.fillSlcOnDemand) { if(this.fillSlcOnDemand) {
var opt0 = dom.createOpt(this.displayAllText,''); var opt0 = dom.createOpt(this.displayAllText, '');
if(curSlc){ if(curSlc){
curSlc.appendChild(opt0); curSlc.appendChild(opt0);
} }
} }
if(array.has(slcA3, slcIndex[i])){ if(array.has(slcA3, slcIndex[i])){
// this._PopulateCheckList(slcIndex[i]);
this.Cpt.checkList._build(slcIndex[i]); this.Cpt.checkList._build(slcIndex[i]);
} else { } else {
this._PopulateSelect(slcIndex[i], true); // this._PopulateSelect(slcIndex[i], true);
this.Cpt.dropdown._build(slcIndex[i], true);
} }
this.SetFilterValue(slcIndex[i],slcSelectedValue); this.SetFilterValue(slcIndex[i],slcSelectedValue);
@ -4023,7 +4026,8 @@ TableFilter.prototype = {
colFltType !== this.fltTypeInp){ colFltType !== this.fltTypeInp){
if(colFltType === this.fltTypeSlc || if(colFltType === this.fltTypeSlc ||
colFltType === this.fltTypeMulti){ colFltType === this.fltTypeMulti){
this.PopulateSelect(ct); // this.PopulateSelect(ct);
this.Cpt.dropdown.build(ct);
} }
if(colFltType === this.fltTypeCheckList){ if(colFltType === this.fltTypeCheckList){
// this.PopulateCheckList(ct); // this.PopulateCheckList(ct);

8
src/index.html
View file

@ -89,20 +89,22 @@
// Your logic here // Your logic here
tf = new TableFilter("demo", { tf = new TableFilter("demo", {
col_0: 'select', col_0: 'select',
col_2: 'select', col_2: 'multiple',
col_3: 'checklist', col_3: 'checklist',
base_path: './', base_path: './',
loader: false, loader: false,
rows_counter: true, rows_counter: true,
enable_default_theme: true, enable_default_theme: true,
paging: true, // slc_filling_method: 'innerhtml',
paging: false,
paging_length: 2, paging_length: 2,
// page_selector_type: 'input', // page_selector_type: 'input',
results_per_page: ['Results per page', [2,4,6]], results_per_page: ['Results per page', [2,4,6]],
remember_grid_values: true, remember_grid_values: true,
// remember_page_number: true, // remember_page_number: true,
// remember_page_length: true, // remember_page_length: true,
fill_slc_on_demand: true, fill_slc_on_demand: false,
refresh_filters: true,
alternate_rows: true, alternate_rows: true,
highlight_keywords: true, highlight_keywords: true,
match_case: false, match_case: false,

8
src/modules/checkList.js
View file

@ -32,8 +32,8 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
this.enableCheckListResetFilter = f.enable_checklist_reset_filter === false ? false : true; this.enableCheckListResetFilter = f.enable_checklist_reset_filter === false ? false : true;
this.isCustom = null; this.isCustom = null;
this.opts = []; this.opts = null;
this.optsTxt = []; this.optsTxt = null;
this.tf = tf; this.tf = tf;
}; };
@ -68,10 +68,14 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
var tf = this.tf; var tf = this.tf;
colIndex = parseInt(colIndex, 10); colIndex = parseInt(colIndex, 10);
this.opts = [];
this.optsTxt = [];
var divFltId = tf.prfxCheckListDiv + colIndex + "_" + tf.id; var divFltId = tf.prfxCheckListDiv + colIndex + "_" + tf.id;
if ((!Dom.id(divFltId) && !isExternal) || (!Dom.id(extFltId) && isExternal)) { if ((!Dom.id(divFltId) && !isExternal) || (!Dom.id(extFltId) && isExternal)) {
return; return;
} }
var flt = !isExternal ? this.checkListDiv[colIndex] : Dom.id(extFltId); var flt = !isExternal ? this.checkListDiv[colIndex] : Dom.id(extFltId);
var ul = Dom.create("ul", ["id", tf.fltIds[colIndex]], ["colIndex", colIndex]); var ul = Dom.create("ul", ["id", tf.fltIds[colIndex]], ["colIndex", colIndex]);
ul.className = this.checkListCssClass; ul.className = this.checkListCssClass;

2
src/modules/checkList.js.map
View file

File diff suppressed because one or more lines are too long

59
src/modules/dropdown.js
View file

@ -1,4 +1,4 @@
define(["exports", "../dom", "../array", "../string", "../sort", "../event"], function (exports, _dom, _array, _string, _sort, _event) { define(["exports", "../dom", "../array", "../string", "../sort"], function (exports, _dom, _array, _string, _sort) {
"use strict"; "use strict";
var _classProps = function (child, staticProps, instanceProps) { var _classProps = function (child, staticProps, instanceProps) {
@ -10,44 +10,55 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
var array = _array.Arr; var array = _array.Arr;
var Str = _string.Str; var Str = _string.Str;
var Sort = _sort.Sort; var Sort = _sort.Sort;
var Event = _event.Event;
var Dropdown = (function () { var Dropdown = (function () {
var Dropdown = function Dropdown(tf) { var Dropdown = function Dropdown(tf) {
// Configuration object // Configuration object
var f = tf.fObj; var f = tf.fObj;
this.enableSlcResetFilter = !f.enable_slc_reset_filter ? false : true; this.enableSlcResetFilter = f.enable_slc_reset_filter ? false : true;
//defines empty option text //defines empty option text
this.nonEmptyText = f.non_empty_text || "(Non empty)"; this.nonEmptyText = f.non_empty_text || "(Non empty)";
//enables/disables onChange event on combo-box
this.onSlcChange = f.on_change === false ? false : true;
//sets select filling method: 'innerHTML' or 'createElement' //sets select filling method: 'innerHTML' or 'createElement'
this.slcFillingMethod = f.slc_filling_method || "createElement"; this.slcFillingMethod = f.slc_filling_method || "createElement";
//IE only, tooltip text appearing on select before it is populated //IE only, tooltip text appearing on select before it is populated
this.activateSlcTooltip = f.activate_slc_tooltip || "Click to activate"; this.activateSlcTooltip = f.activate_slc_tooltip || "Click to activate";
//tooltip text appearing on multiple select //tooltip text appearing on multiple select
this.multipleSlcTooltip = f.multiple_slc_tooltip || "Use Ctrl key for multiple selections"; this.multipleSlcTooltip = f.multiple_slc_tooltip || "Use Ctrl key for multiple selections";
this.hasCustomSlcOptions = types.isObj(f.custom_slc_options) ? true : false;
this.customSlcOptions = types.isArray(f.custom_slc_options) ? f.custom_slc_options : null;
this.isCustom = null; this.isCustom = null;
this.opts = []; this.opts = null;
this.optsTxt = []; this.optsTxt = null;
this.slcInnerHtml = ""; this.slcInnerHtml = null;
this.tf = tf; this.tf = tf;
}; };
_classProps(Dropdown, null, { _classProps(Dropdown, null, {
build: {
writable: true,
value: function (colIndex, isRefreshed, isExternal, extSlcId) {
var tf = this.tf;
tf.EvtManager(tf.Evt.name.dropdown, {
slcIndex: colIndex,
slcRefreshed: isRefreshed,
slcExternal: isExternal,
slcId: extSlcId
});
}
},
_build: { _build: {
writable: true, writable: true,
value: function (colIndex, isRefreshed, isExternal, extFltId) { value: function (colIndex, isRefreshed, isExternal, extSlcId) {
if (extFltId === undefined) extFltId = null; if (extSlcId === undefined) extSlcId = null;
if (isExternal === undefined) isExternal = false; if (isExternal === undefined) isExternal = false;
if (isRefreshed === undefined) isRefreshed = false; if (isRefreshed === undefined) isRefreshed = false;
var tf = this.tf; var tf = this.tf;
colIndex = parseInt(colIndex, 10); colIndex = parseInt(colIndex, 10);
this.opts = [];
this.optsTxt = [];
this.slcInnerHtml = "";
var slcId = tf.fltIds[colIndex]; var slcId = tf.fltIds[colIndex];
if ((!Dom.id(slcId) && !isExternal) || (!Dom.id(extSlcId) && isExternal)) { if ((!Dom.id(slcId) && !isExternal) || (!Dom.id(extSlcId) && isExternal)) {
return; return;
@ -55,7 +66,7 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
var slc = !isExternal ? Dom.id(slcId) : Dom.id(extSlcId), rows = tf.tbl.rows, matchCase = tf.matchCase, fillMethod = Str.lower(this.slcFillingMethod); var slc = !isExternal ? Dom.id(slcId) : Dom.id(extSlcId), rows = tf.tbl.rows, matchCase = tf.matchCase, fillMethod = Str.lower(this.slcFillingMethod);
//custom select test //custom select test
this.isCustom = (this.hasCustomSlcOptions && array.has(this.customSlcOptions.cols, colIndex)); this.isCustom = (tf.hasCustomSlcOptions && array.has(tf.customSlcOptions.cols, colIndex));
//custom selects text //custom selects text
var activeFlt; var activeFlt;
@ -65,14 +76,14 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
} }
/*** remember grid values ***/ /*** remember grid values ***/
var flts_values = [], fltArr = []; var fltsValues = [], fltArr = [];
if (tf.rememberGridValues) { if (tf.rememberGridValues) {
flts_values = tf.Cpt.store.getFilterValues(tf.fltsValuesCookie); fltsValues = tf.Cpt.store.getFilterValues(tf.fltsValuesCookie);
if (flts_values && !Str.isEmpty(flts_values.toString())) { if (fltsValues && !Str.isEmpty(fltsValues.toString())) {
if (this.isCustom) { if (this.isCustom) {
fltArr.push(flts_values[colIndex]); fltArr.push(fltsValues[colIndex]);
} else { } else {
fltArr = flts_values[colIndex].split(" " + tf.orOperator + " "); fltArr = fltsValues[colIndex].split(" " + tf.orOperator + " ");
} }
} }
} }
@ -96,12 +107,11 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
if (nchilds !== tf.nbCells || this.isCustom) { if (nchilds !== tf.nbCells || this.isCustom) {
continue; continue;
} }
// checks if row has exact cell #
// if(nchilds === this.nbCells && !this.isCustom){
// this loop retrieves cell data // this loop retrieves cell data
for (var j = 0; j < nchilds; j++) { for (var j = 0; j < nchilds; j++) {
if ((colIndex === j && (!isRefreshed || (isRefreshed && tf.disableExcludedOptions))) || (colIndex == j && isRefreshed && ((rows[k].style.display === "" && !tf.paging) || (tf.paging && (!tf.validRowsIndex || (tf.validRowsIndex && array.has(tf.validRowsIndex, k))) && ((activeFlt === undefined || activeFlt == colIndex) || (activeFlt != colIndex && array.has(tf.validRowsIndex, k))))))) { if ((colIndex === j && (!isRefreshed || (isRefreshed && tf.disableExcludedOptions))) || (colIndex == j && isRefreshed && ((rows[k].style.display === "" && !tf.paging) || (tf.paging && (!tf.validRowsIndex || (tf.validRowsIndex && array.has(tf.validRowsIndex, k))) && ((activeFlt === undefined || activeFlt == colIndex) || (activeFlt != colIndex && array.has(tf.validRowsIndex, k))))))) {
var cell_data = this.GetCellData(j, cell[j]), var cell_data = tf.GetCellData(j, cell[j]),
//Vary Peter's patch //Vary Peter's patch
cell_string = Str.matchCase(cell_data, matchCase); cell_string = Str.matchCase(cell_data, matchCase);
@ -121,7 +131,6 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
} }
} //if colIndex==j } //if colIndex==j
} //for j } //for j
// }//if
} //for k } //for k
//Retrieves custom values //Retrieves custom values
@ -187,12 +196,12 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
} }
//populates drop-down //populates drop-down
this.addOptions(colIndex, slc, excludedOpts, fltArr); this.addOptions(colIndex, slc, isRefreshed, excludedOpts, fltsValues, fltArr);
} }
}, },
addOptions: { addOptions: {
writable: true, writable: true,
value: function (colIndex, slc, excludedOpts, fltArr) { value: function (colIndex, slc, isRefreshed, excludedOpts, fltsValues, fltArr) {
var tf = this.tf, fillMethod = Str.lower(this.slcFillingMethod), slcValue = slc.value; var tf = this.tf, fillMethod = Str.lower(this.slcFillingMethod), slcValue = slc.value;
slc.innerHTML = ""; slc.innerHTML = "";
@ -222,7 +231,7 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
opt = Dom.createOpt(lbl, val, true); opt = Dom.createOpt(lbl, val, true);
} else { } else {
if (tf["col" + colIndex] !== tf.fltTypeMulti) { if (tf["col" + colIndex] !== tf.fltTypeMulti) {
opt = Dom.createOpt(lbl, val, (flts_values[colIndex] !== " " && val === flts_values[colIndex]) ? true : false); opt = Dom.createOpt(lbl, val, (fltsValues[colIndex] !== " " && val === fltsValues[colIndex]) ? true : false);
} else { } else {
opt = Dom.createOpt(lbl, val, (array.has(fltArr, Str.matchCase(this.opts[y], tf.matchCase), tf.matchCase) || fltArr.toString().indexOf(val) !== -1) ? true : false); opt = Dom.createOpt(lbl, val, (array.has(fltArr, Str.matchCase(this.opts[y], tf.matchCase), tf.matchCase) || fltArr.toString().indexOf(val) !== -1) ? true : false);
} }

2
src/modules/dropdown.js.map
View file

File diff suppressed because one or more lines are too long