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

Reduces Array utility function in tablefilter module

Browse source
This commit is contained in:
Max Guglielmi 2015-10-19 23:41:09 +11:00
parent 2da9b3dd66
commit b42ffa5339
12 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
table.TF{border-left:1px solid #ccc !important;border-top:none !important;border-right:none !important;border-bottom:none !important;}table.TF th{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;color:#333 !important}table.TF td{border-bottom:1px dotted #999 !important;padding:5px !important}.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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
table.TF{border-left:1px dotted #81963b !important;border-top:none !important;border-right:0 !important;border-bottom:none !important;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;color:#fff !important}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px !important}.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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.0.5 by Max Guglielmi
* build date: 2015-10-18T10:51:20.463Z
* build date: 2015-10-19T12:38:36.161Z
* MIT License
*/
table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important}

10
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

15
src/modules/checkList.js
View file

@ -136,7 +136,7 @@ export class CheckList{
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && ((!activeFlt || activeFlt===colIndex )||
(activeFlt!=colIndex &&
Arr.has(tf.validRowsIndex, k))) )))){
tf.validRowsIndex.indexOf(k) != -1)) )))){
var cell_data = tf.getCellData(j, cells[j]);
//Vary Peter's patch
var cell_string = Str.matchCase(
@ -150,8 +150,7 @@ export class CheckList{
if(!filteredCol){
filteredCol = tf.getFilteredDataCol(j);
}
if(!Arr.has(filteredCol,
cell_string, tf.matchCase) &&
if(!Arr.has(filteredCol, cell_string, tf.matchCase) &&
!Arr.has(this.excludedOpts,
cell_string, tf.matchCase) &&
!tf.isFirstLoad){
@ -183,7 +182,7 @@ export class CheckList{
}
}
//asc sort
if(tf.sortNumAsc && Arr.has(tf.sortNumAsc, colIndex)){
if(tf.sortNumAsc && tf.sortNumAsc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortAsc);
if(this.excludedOpts){
@ -203,7 +202,7 @@ export class CheckList{
}//in case there are alphanumeric values
}
//desc sort
if(tf.sortNumDesc && Arr.has(tf.sortNumDesc, colIndex)){
if(tf.sortNumDesc && tf.sortNumDesc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortDesc);
if(this.excludedOpts){
@ -245,7 +244,7 @@ export class CheckList{
store.getFilterValues(tf.fltsValuesCookie)[colIndex] : null;
if(tmpVal && Str.trim(tmpVal).length > 0){
if(tf.hasCustomSlcOptions &&
Arr.has(tf.customSlcOptions.cols, colIndex)){
tf.customSlcOptions.cols.indexOf(colIndex) != -1){
fltArr.push(tmpVal);
} else {
fltArr = tmpVal.split(' '+tf.orOperator+' ');
@ -278,8 +277,8 @@ export class CheckList{
/*** remember grid values ***/
if(tf.rememberGridValues){
if((tf.hasCustomSlcOptions &&
Arr.has(tf.customSlcOptions.cols, colIndex) &&
fltArr.toString().indexOf(val)!= -1) ||
tf.customSlcOptions.cols.indexOf(colIndex) != -1 &&
fltArr.toString().indexOf(val) != -1) ||
Arr.has(fltArr,
Str.matchCase(val, tf.matchCase), tf.matchCase)){
li.check.checked = true;

8
src/modules/dropdown.js
View file

@ -134,10 +134,10 @@ export class Dropdown{
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && (!tf.validRowsIndex ||
(tf.validRowsIndex &&
Arr.has(tf.validRowsIndex, k))) &&
tf.validRowsIndex.indexOf(k) != -1)) &&
((activeFlt===undefined || activeFlt==colIndex) ||
(activeFlt!=colIndex &&
Arr.has(tf.validRowsIndex, k) ))) ))){
tf.validRowsIndex.indexOf(k) != -1 ))) ))){
var cell_data = tf.getCellData(j, cell[j]),
//Vary Peter's patch
cell_string = Str.matchCase(cell_data, matchCase);
@ -183,7 +183,7 @@ export class Dropdown{
}
//asc sort
if(tf.sortNumAsc && Arr.has(tf.sortNumAsc, colIndex)){
if(tf.sortNumAsc && tf.sortNumAsc.indexOf(colIndex) != -1){
try{
this.opts.sort( numSortAsc );
if(excludedOpts){
@ -203,7 +203,7 @@ export class Dropdown{
}//in case there are alphanumeric values
}
//desc sort
if(tf.sortNumDesc && Arr.has(tf.sortNumDesc, colIndex)){
if(tf.sortNumDesc && tf.sortNumDesc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortDesc);
if(excludedOpts){

18
src/tablefilter.js
View file

@ -1424,13 +1424,13 @@ export class TableFilter{
slc.options[0].selected = false;
//selects
if(Arr.has(slcFltsIndex, i)){
if(slcFltsIndex.indexOf(i) != -1){
opt = Dom.createOpt(fltsValues[i],fltsValues[i],true);
slc.appendChild(opt);
this.hasStoredValues = true;
}
//multiple select
if(Arr.has(multiFltsIndex, i)){
if(multiFltsIndex.indexOf(i) != -1){
s = fltsValues[i].split(' '+this.orOperator+' ');
for(let j=0, len=s.length; j<len; j++){
if(s[j]===''){
@ -1922,7 +1922,7 @@ export class TableFilter{
let isExludedRow = false;
// checks if current row index appears in exclude array
if(exclude && Types.isArray(exclude)){
isExludedRow = Arr.has(exclude, i);
isExludedRow = exclude.indexOf(i) != -1;
}
let cell = row[i].cells,
nchilds = cell.length;
@ -2092,7 +2092,7 @@ export class TableFilter{
return '';
}
//First checks for customCellData event
if(this.customCellData && Arr.has(this.customCellDataCols, i)){
if(this.customCellData && this.customCellDataCols.indexOf(i) != -1){
return this.customCellData.call(null, this, cell, i);
} else {
return Dom.getText(cell);
@ -2420,13 +2420,13 @@ export class TableFilter{
// Welcome to cyclomatic complexity hell :)
// TODO: simplify/refactor if statement
if(activeFlt!==slcIndex[i] ||
(this.paging && Arr.has(slcA1, slcIndex[i]) &&
(this.paging && slcA1.indexOf(slcIndex[i]) != -1 &&
activeFlt === slcIndex[i] ) ||
(!this.paging && (Arr.has(slcA3, slcIndex[i]) ||
Arr.has(slcA2, slcIndex[i]))) ||
(!this.paging && (slcA3.indexOf(slcIndex[i]) != -1 ||
slcA2.indexOf(slcIndex[i]) != -1)) ||
slcSelectedValue === this.displayAllText ){
if(Arr.has(slcA3, slcIndex[i])){
if(slcA3.indexOf(slcIndex[i]) != -1){
this.Mod.checkList.checkListDiv[slcIndex[i]].innerHTML = '';
} else {
curSlc.innerHTML = '';
@ -2440,7 +2440,7 @@ export class TableFilter{
}
}
if(Arr.has(slcA3, slcIndex[i])){
if(slcA3.indexOf(slcIndex[i]) != -1){
this.Mod.checkList._build(slcIndex[i]);
} else {
this.Mod.dropdown._build(slcIndex[i], true);

1
test/test-checklist.js
View file

@ -19,6 +19,7 @@ test('CheckList UI elements', function() {
var flt = id(tf.fltIds[3]);
notEqual(flt, null, 'CheckList UL element');
deepEqual(flt.firstChild.nodeName, 'LI', 'First CheckList option element name');
deepEqual(flt.childNodes.length, 8, 'number of checklist options');
});
test('TableFilter removed', function() {