1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2026-03-16 23:55:46 +01:00

Extended eslint to tests

This commit is contained in:
Max Guglielmi 2016-02-22 18:14:58 +11:00
commit 6f0a009200
21 changed files with 239 additions and 194 deletions

View file

@ -93,33 +93,33 @@ export default {
case 'DDMMMYYYY':
parts = dateStr.replace(/[- \/.]/g,' ').split(' ');
oDate = new Date(y2kDate(parts[2]),mmm2mm(parts[1])-1,parts[0]);
break;
break;
case 'DMY':
/* eslint-disable */
parts = dateStr.replace(
/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
oDate = new Date(y2kDate(parts[2]),parts[1]-1,parts[0]);
/* eslint-enable */
break;
break;
case 'MDY':
/* eslint-disable */
parts = dateStr.replace(
/^(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
oDate = new Date(y2kDate(parts[2]),parts[0]-1,parts[1]);
/* eslint-enable */
break;
break;
case 'YMD':
/* eslint-disable */
parts = dateStr.replace(/^((\d\d)?\d\d)([- \/.])(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])$/,'$1 $4 $6').split(' ');
oDate = new Date(y2kDate(parts[0]),parts[1]-1,parts[2]);
/* eslint-enable */
break;
break;
default: //in case format is not correct
/* eslint-disable */
parts = dateStr.replace(/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
oDate = new Date(y2kDate(parts[2]),parts[1]-1,parts[0]);
/* eslint-enable */
break;
break;
}
return oDate;
}
@ -156,11 +156,11 @@ function mmm2mm(mmm){
'nov','dec'
];
for(let m_i=0; m_i < MONTH_NAMES.length; m_i++){
let month_name = MONTH_NAMES[m_i];
if (mmm.toLowerCase() === month_name){
mondigit = m_i+1;
break;
}
let month_name = MONTH_NAMES[m_i];
if (mmm.toLowerCase() === month_name){
mondigit = m_i+1;
break;
}
}
if(mondigit > 11 || mondigit < 23){
mondigit = mondigit - 12;

View file

@ -93,16 +93,24 @@ export default class AdapterEzEditTable {
//Next valid filtered row needs to be selected
var doSelect = function(nextRowIndex){
if(et.defaultSelection === 'row'){
/* eslint-disable */
slc.SelectRowByIndex(nextRowIndex);
/* eslint-enable */
} else {
/* eslint-disable */
et.ClearSelections();
/* eslint-enable */
var cellIndex = selectedElm.cellIndex,
row = tf.tbl.rows[nextRowIndex];
if(et.defaultSelection === 'both'){
/* eslint-disable */
slc.SelectRowByIndex(nextRowIndex);
/* eslint-enable */
}
if(row){
/* eslint-disable */
slc.SelectCell(row.cells[cellIndex]);
/* eslint-enable */
}
}
//Table is filtered
@ -135,7 +143,9 @@ export default class AdapterEzEditTable {
selectedElm.parentNode : selectedElm,
//cell for default_selection = 'both' or 'cell'
cell = selectedElm.nodeName==='TD' ? selectedElm : null,
/* eslint-disable */
keyCode = e !== undefined ? et.Event.GetKey(e) : 0,
/* eslint-enable */
isRowValid = validIndexes.indexOf(row.rowIndex) !== -1,
nextRowIndex,
paging = tf.feature('paging'),
@ -244,11 +254,15 @@ export default class AdapterEzEditTable {
var advGrid = paging.tf.extension('advancedGrid');
var et = advGrid._ezEditTable;
var slc = et.Selection;
/* eslint-disable */
var row = slc.GetActiveRow();
/* eslint-enable */
if(row){
row.scrollIntoView(false);
}
/* eslint-disable */
var cell = slc.GetActiveCell();
/* eslint-enable */
if(cell){
cell.scrollIntoView(false);
}
@ -342,8 +356,10 @@ export default class AdapterEzEditTable {
}
try{
/* eslint-disable */
this._ezEditTable = new EditTable(tf.id, cfg, startRow);
this._ezEditTable.Init();
/* eslint-enable */
} catch(e) { throw new Error(this.err); }
this.initialized = true;
@ -356,10 +372,14 @@ export default class AdapterEzEditTable {
var ezEditTable = this._ezEditTable;
if(ezEditTable){
if(this.cfg.selection){
/* eslint-disable */
ezEditTable.Selection.Set();
/* eslint-enable */
}
if(this.cfg.editable){
/* eslint-disable */
ezEditTable.Editable.Set();
/* eslint-enable */
}
}
}
@ -370,14 +390,22 @@ export default class AdapterEzEditTable {
toggle(){
var ezEditTable = this._ezEditTable;
if(ezEditTable.editable){
/* eslint-disable */
ezEditTable.Editable.Remove();
/* eslint-enable */
} else {
/* eslint-disable */
ezEditTable.Editable.Set();
/* eslint-enable */
}
if(ezEditTable.selection){
/* eslint-disable */
ezEditTable.Selection.Remove();
/* eslint-enable */
} else {
/* eslint-disable */
ezEditTable.Selection.Set();
/* eslint-enable */
}
}
@ -400,11 +428,15 @@ export default class AdapterEzEditTable {
var ezEditTable = this._ezEditTable;
if(ezEditTable){
if(this.cfg.selection){
/* eslint-disable */
ezEditTable.Selection.ClearSelections();
ezEditTable.Selection.Remove();
/* eslint-enable */
}
if(this.cfg.editable){
/* eslint-disable */
ezEditTable.Editable.Remove();
/* eslint-enable */
}
}

View file

@ -123,7 +123,7 @@ export default class ColOps{
mThisCol=-1;
for(var k=0; k<colIndex.length; k++){
if(colIndex[k] === ucolIndex[ucol]){
if(colIndex[k] === ucolIndex[ucol]){
mThisCol++;
opsThisCol[mThisCol]=Str.lower(operation[k]);
decThisCol[mThisCol]=decimalPrecision[k];
@ -135,25 +135,25 @@ export default class ColOps{
switch(opsThisCol[mThisCol]){
case 'mean':
meanFlag=1;
break;
break;
case 'sum':
sumFlag=1;
break;
break;
case 'min':
minFlag=1;
break;
break;
case 'max':
maxFlag=1;
break;
break;
case 'median':
medFlag=1;
break;
case 'q1':
q1Flag=1;
break;
break;
case 'q3':
q3Flag=1;
break;
break;
}
}
}
@ -163,8 +163,10 @@ export default class ColOps{
if((q1Flag==1)|| (q3Flag==1) || (medFlag==1)){
if (j<colvalues[ucol].length -1){
for(k=j+1; k<colvalues[ucol].length; k++) {
/* eslint-disable */
if(eval(colvalues[ucol][k]) <
eval(colvalues[ucol][j])){
/* eslint-enable */
temp = colvalues[ucol][j];
colvalues[ucol][j] = colvalues[ucol][k];
colvalues[ucol][k] = temp;
@ -237,25 +239,25 @@ export default class ColOps{
switch( opsThisCol[i] ){
case 'mean':
result=meanValue;
break;
break;
case 'sum':
result=sumValue;
break;
break;
case 'min':
result=minValue;
break;
break;
case 'max':
result=maxValue;
break;
break;
case 'median':
result=medValue;
break;
case 'q1':
result=q1Value;
break;
break;
case 'q3':
result=q3Value;
break;
break;
}
var precision = !isNaN(decThisCol[i]) ? decThisCol[i] : 2;
@ -273,17 +275,17 @@ export default class ColOps{
} else{
Dom.id(labThisCol[i]).innerHTML= result;
}
break;
break;
case 'setvalue':
Dom.id( labThisCol[i] ).value = result;
break;
break;
case 'createtextnode':
var oldnode = Dom.id(labThisCol[i])
.firstChild;
var txtnode = Dom.text(result);
Dom.id(labThisCol[i])
.replaceChild(txtnode, oldnode);
break;
break;
}//switch
}
} else {

View file

@ -67,29 +67,27 @@ export class Loader extends Feature{
// Subscribe to events
emitter.on([
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-clearing-filters',
'before-changing-results-per-page',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
'before-loading-themes'
],
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-clearing-filters',
'before-changing-results-per-page',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
'before-loading-themes'],
()=> this.show('')
);
emitter.on([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'
],
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'],
()=> this.show('none')
);
@ -130,29 +128,27 @@ export class Loader extends Feature{
// Unsubscribe to events
emitter.off([
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-clearing-filters',
'before-changing-results-per-page',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
'before-loading-themes'
],
'before-filtering',
'before-populating-filter',
'before-changing-page',
'before-clearing-filters',
'before-changing-results-per-page',
'before-reset-page',
'before-reset-page-length',
'before-loading-extensions',
'before-loading-themes'],
()=> this.show('')
);
emitter.off([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'
],
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'],
()=> this.show('none')
);

View file

@ -470,19 +470,19 @@ export class Paging extends Feature{
switch(Str.lower(cmd)){
case 'next':
btnEvt.next();
break;
break;
case 'previous':
btnEvt.prev();
break;
break;
case 'last':
btnEvt.last();
break;
break;
case 'first':
btnEvt.first();
break;
break;
default:
btnEvt.next();
break;
break;
}
}
else if(cmdtype === 'number'){

View file

@ -133,16 +133,15 @@ export class StatusBar extends Feature{
()=> this.message(this.msgLoadThemes));
emitter.on([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'
],
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'],
()=> this.message('')
);
@ -205,16 +204,15 @@ export class StatusBar extends Feature{
()=> this.message(this.msgLoadThemes));
emitter.off([
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'
],
'after-filtering',
'after-populating-filter',
'after-changing-page',
'after-clearing-filters',
'after-changing-results-per-page',
'after-reset-page',
'after-reset-page-length',
'after-loading-extensions',
'after-loading-themes'],
()=> this.message('')
);

View file

@ -1,7 +1,7 @@
import Str from './string';
export default {
ignoreCase(a, b){
ignoreCase(a, b){
let x = Str.lower(a);
let y = Str.lower(b);
return ((x < y) ? -1 : ((x > y) ? 1 : 0));

View file

@ -609,7 +609,7 @@ export class TableFilter {
Mod.paging = new Paging(this);
Mod.paging.init();
} else{
Mod.paging.reset();
Mod.paging.reset();
}
}
if(this.btnReset){
@ -821,7 +821,9 @@ export class TableFilter {
// Require pattern for Webpack
require(['./' + modulePath], (mod)=> {
/* eslint-disable */
let inst = new mod.default(this, ext);
/* eslint-enable */
inst.init();
this.ExtRegistry[name] = inst;
});
@ -1415,12 +1417,12 @@ export class TableFilter {
//multiple search parameter operator ||
let sAOrSplit = sA.toString().split(this.orOperator),
//multiple search || parameter boolean
hasMultiOrSA = sAOrSplit.length > 1,
//multiple search parameter operator &&
sAAndSplit = sA.toString().split(this.anOperator),
//multiple search && parameter boolean
hasMultiAndSA = sAAndSplit.length > 1;
//multiple search || parameter boolean
hasMultiOrSA = sAOrSplit.length > 1,
//multiple search parameter operator &&
sAAndSplit = sA.toString().split(this.anOperator),
//multiple search && parameter boolean
hasMultiAndSA = sAAndSplit.length > 1;
//detect operators or array query
if(Types.isArray(sA) || hasMultiOrSA || hasMultiAndSA){
@ -1922,12 +1924,12 @@ export class TableFilter {
return;
}
tbl = tbl || this.tbl;
let rIndex;
if(rowIndex === undefined){
rIndex = tbl.rows[0].style.display!='none' ? 0 : 1;
} else{
rIndex = rowIndex;
}
// let rIndex;
// if(rowIndex === undefined){
// rIndex = tbl.rows[0].style.display!='none' ? 0 : 1;
// } else{
// rIndex = rowIndex;
// }
setWidths.call(this);