Skip to content

Commit 87c4dbf

Browse files
olifolkerdolifolkerd
committedJul 8, 2022
add final linting tweaks
1 parent 2eebd5d commit 87c4dbf

File tree

6 files changed

+87
-89
lines changed

6 files changed

+87
-89
lines changed
 

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ module.exports = {
2323
"no-inner-declarations": "off",
2424
"no-prototype-builtins": "off",
2525
"no-empty": ["error", { "allowEmptyCatch": true }],
26-
"curly": "error",
26+
// "curly": "error",
2727
}
2828
}

‎src/js/core/RowManager.js

+26-26
Original file line numberDiff line numberDiff line change
@@ -696,28 +696,28 @@ export default class RowManager extends CoreFeature{
696696

697697
case "dataPipeline":
698698

699-
for(let i = index; i < this.dataPipeline.length; i++){
700-
let result = this.dataPipeline[i].handler(this.activeRowsPipeline[i].slice(0));
699+
for(let i = index; i < this.dataPipeline.length; i++){
700+
let result = this.dataPipeline[i].handler(this.activeRowsPipeline[i].slice(0));
701+
702+
this.activeRowsPipeline[i + 1] = result || this.activeRowsPipeline[i].slice(0);
703+
}
704+
705+
this.setActiveRows(this.activeRowsPipeline[this.dataPipeline.length]);
701706

702-
this.activeRowsPipeline[i + 1] = result || this.activeRowsPipeline[i].slice(0);
703-
}
704-
705-
this.setActiveRows(this.activeRowsPipeline[this.dataPipeline.length]);
706-
707707
case "display":
708-
index = 0;
709-
this.resetDisplayRows();
710-
711-
case "displayPipeline":
712-
for(let i = index; i < this.displayPipeline.length; i++){
713-
let result = this.displayPipeline[i].handler((i ? this.getDisplayRows(i - 1) : this.activeRows).slice(0), renderInPosition);
708+
index = 0;
709+
this.resetDisplayRows();
714710

715-
this.setDisplayRows(result || this.getDisplayRows(i - 1).slice(0), i);
716-
}
711+
case "displayPipeline":
712+
for(let i = index; i < this.displayPipeline.length; i++){
713+
let result = this.displayPipeline[i].handler((i ? this.getDisplayRows(i - 1) : this.activeRows).slice(0), renderInPosition);
714+
715+
this.setDisplayRows(result || this.getDisplayRows(i - 1).slice(0), i);
716+
}
717717

718718
case "end":
719-
//case to handle scenario when trying to skip past end stage
720-
this.regenerateRowPositions();
719+
//case to handle scenario when trying to skip past end stage
720+
this.regenerateRowPositions();
721721
}
722722
}
723723

@@ -804,19 +804,19 @@ export default class RowManager extends CoreFeature{
804804

805805
switch(type){
806806
case "active":
807-
rows = this.activeRows;
808-
break;
807+
rows = this.activeRows;
808+
break;
809809

810810
case "display":
811-
rows = this.table.rowManager.getDisplayRows();
812-
break;
813-
811+
rows = this.table.rowManager.getDisplayRows();
812+
break;
813+
814814
case "visible":
815-
rows = this.getVisibleRows(false, true);
816-
break;
817-
815+
rows = this.getVisibleRows(false, true);
816+
break;
817+
818818
default:
819-
rows = this.chain("rows-retrieve", type, null, this.rows) || this.rows;
819+
rows = this.chain("rows-retrieve", type, null, this.rows) || this.rows;
820820
}
821821

822822
return rows;

‎src/js/modules/Edit/List.js

+47-47
Original file line numberDiff line numberDiff line change
@@ -279,36 +279,36 @@ export default class Edit{
279279
switch(e.keyCode){
280280

281281
case 38: //up arrow
282-
this._keyUp(e);
283-
break;
282+
this._keyUp(e);
283+
break;
284284

285285
case 40: //down arrow
286-
this._keyDown(e);
287-
break;
286+
this._keyDown(e);
287+
break;
288288

289289
case 37: //left arrow
290290
case 39: //right arrow
291-
this._keySide(e);
292-
break;
291+
this._keySide(e);
292+
break;
293293

294294
case 13: //enter
295-
this._keyEnter();
296-
break;
295+
this._keyEnter();
296+
break;
297297

298298
case 27: //escape
299-
this._keyEsc();
300-
break;
299+
this._keyEsc();
300+
break;
301301

302302
case 36: //home
303303
case 35: //end
304-
this._keyHomeEnd(e);
305-
break;
304+
this._keyHomeEnd(e);
305+
break;
306306

307307
case 9: //tab
308-
break;
308+
break;
309309

310310
default:
311-
this._keySelectLetter(e);
311+
this._keySelectLetter(e);
312312
}
313313
}
314314

@@ -320,10 +320,10 @@ export default class Edit{
320320
case 40: //right arrow
321321
case 13: //enter
322322
case 27: //escape
323-
break;
323+
break;
324324

325325
default:
326-
this._keyAutoCompLetter(e);
326+
this._keyAutoCompLetter(e);
327327
}
328328
}
329329

@@ -473,14 +473,14 @@ export default class Edit{
473473

474474
rebuildOptionsList(){
475475
this._generateOptions()
476-
.then(this._sortOptions.bind(this))
477-
.then(this._buildList.bind(this))
478-
.then(this._showList.bind(this))
479-
.catch((e) => {
480-
if(!Number.isInteger(e)){
481-
console.error("List generation error", e);
482-
}
483-
});
476+
.then(this._sortOptions.bind(this))
477+
.then(this._buildList.bind(this))
478+
.then(this._showList.bind(this))
479+
.catch((e) => {
480+
if(!Number.isInteger(e)){
481+
console.error("List generation error", e);
482+
}
483+
});
484484
}
485485

486486
_filterList(){
@@ -512,13 +512,13 @@ export default class Edit{
512512
}
513513

514514
return values.then()
515-
.then((responseValues) => {
516-
if(this.listIteration === iteration){
517-
return this._parseList(responseValues);
518-
}else{
519-
return Promise.reject(iteration);
520-
}
521-
});
515+
.then((responseValues) => {
516+
if(this.listIteration === iteration){
517+
return this._parseList(responseValues);
518+
}else{
519+
return Promise.reject(iteration);
520+
}
521+
});
522522
}else{
523523
return Promise.resolve(this._parseList(values));
524524
}
@@ -552,22 +552,22 @@ export default class Edit{
552552
url = urlBuilder(url, {}, params);
553553

554554
return fetch(url)
555-
.then((response)=>{
556-
if(response.ok) {
557-
return response.json()
558-
.catch((error)=>{
559-
console.warn("List Ajax Load Error - Invalid JSON returned", error);
560-
return Promise.reject(error);
561-
});
562-
}else{
563-
console.error("List Ajax Load Error - Connection Error: " + response.status, response.statusText);
564-
return Promise.reject(response);
565-
}
566-
})
567-
.catch((error)=>{
568-
console.error("List Ajax Load Error - Connection Error: ", error);
569-
return Promise.reject(error);
570-
});
555+
.then((response)=>{
556+
if(response.ok) {
557+
return response.json()
558+
.catch((error)=>{
559+
console.warn("List Ajax Load Error - Invalid JSON returned", error);
560+
return Promise.reject(error);
561+
});
562+
}else{
563+
console.error("List Ajax Load Error - Connection Error: " + response.status, response.statusText);
564+
return Promise.reject(response);
565+
}
566+
})
567+
.catch((error)=>{
568+
console.error("List Ajax Load Error - Connection Error: ", error);
569+
return Promise.reject(error);
570+
});
571571
}
572572

573573
_uniqueColumnValues(field){

‎src/js/modules/Edit/defaults/editors/date.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ export default function(cell, onRendered, success, cancel, editorParams){
9292
switch(e.keyCode){
9393
// case 9:
9494
case 13:
95-
onChange(e);
96-
break;
95+
onChange(e);
96+
break;
9797

9898
case 27:
99-
cancel();
100-
break;
99+
cancel();
100+
break;
101101

102102
case 35:
103103
case 36:
104-
e.stopPropagation();
105-
break;
104+
e.stopPropagation();
105+
break;
106106
}
107107
});
108108

‎src/js/modules/Edit/defaults/editors/datetime.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ export default function(cell, onRendered, success, cancel, editorParams){
7979
switch(e.keyCode){
8080
// case 9:
8181
case 13:
82-
onChange(e);
83-
break;
82+
onChange(e);
83+
break;
8484

8585
case 27:
86-
cancel();
87-
break;
86+
cancel();
87+
break;
8888

8989
case 35:
9090
case 36:
91-
e.stopPropagation();
92-
break;
91+
e.stopPropagation();
92+
break;
9393
}
9494
});
9595

‎src/js/modules/Sort/defaults/sorters/array.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//sort if element contains any data
22
export default function(a, b, aRow, bRow, column, dir, params){
3-
var el1 = 0,
4-
el2 = 0,
5-
type = params.type || "length",
3+
var type = params.type || "length",
64
alignEmptyValues = params.alignEmptyValues,
75
emptyAlign = 0;
86

0 commit comments

Comments
 (0)
Please sign in to comment.