Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/js/core/tools/Popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,9 @@ export default class Popup extends CoreFeature{
return this;
}

/** @param {KeyboardEvent} e */
_escapeCheck(e){
if(e.keyCode == 27){
if(e.key == 27){
this.hide();
}
}
Expand Down
38 changes: 19 additions & 19 deletions src/js/modules/Edit/List.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,35 +279,35 @@ export default class Edit{
}

_inputKeyDown(e){
switch(e.keyCode){
switch(e.key){

case 38: //up arrow
case "ArrowUp":
this._keyUp(e);
break;

case 40: //down arrow
case "ArrowDown":
this._keyDown(e);
break;

case 37: //left arrow
case 39: //right arrow
case "ArrowLeft":
case "ArrowRight":
this._keySide(e);
break;

case 13: //enter
case "Enter":
this._keyEnter();
break;

case 27: //escape
case "Escape":
this._keyEsc();
break;

case 36: //home
case 35: //end
case "Home":
case "End":
this._keyHomeEnd(e);
break;

case 9: //tab
case "Tab":
this._keyTab(e);
break;

Expand All @@ -317,13 +317,13 @@ export default class Edit{
}

_inputKeyUp(e){
switch(e.keyCode){
case 38: //up arrow
case 37: //left arrow
case 39: //up arrow
case 40: //right arrow
case 13: //enter
case 27: //escape
switch(e.key){
case "ArrowUp":
case "ArrowLeft":
case "ArrowRight":
case "ArrowDown":
case "Enter":
case "Escape":
break;

default:
Expand Down Expand Up @@ -432,8 +432,8 @@ export default class Edit{
e.preventDefault();
// }

if(e.keyCode >= 38 && e.keyCode <= 90){
this._scrollToValue(e.keyCode);
if(e.key.length === 1){
this._scrollToValue(e.key.toUpperCase().charCodeAt(0));
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/js/modules/Edit/defaults/editors/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
// case 9:
case 13:
switch(e.key){
// case "Tab":
case "Enter":
onChange();
break;

case 27:
case "Escape":
cancel();
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;

case 38: //up arrow
case 40: //down arrow
case "ArrowUp":
case "ArrowDown":
if(vertNav == "editor"){
e.stopImmediatePropagation();
e.stopPropagation();
Expand Down
16 changes: 8 additions & 8 deletions src/js/modules/Edit/defaults/editors/datetime.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,23 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
// case 9:
case 13:
switch(e.key){
// case "Tab":
case "Enter":
onChange();
break;

case 27:
case "Escape":
cancel();
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;

case 38: //up arrow
case 40: //down arrow
case "ArrowUp":
case "ArrowDown":
if(vertNav == "editor"){
e.stopImmediatePropagation();
e.stopPropagation();
Expand Down
12 changes: 6 additions & 6 deletions src/js/modules/Edit/defaults/editors/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
// case 9:
case 13:
switch(e.key){
// case "Tab":
case "Enter":
onChange(e);
break;

case 27:
case "Escape":
cancel();
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;
}
Expand Down
16 changes: 8 additions & 8 deletions src/js/modules/Edit/defaults/editors/number.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,26 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
case 13:
// case 9:
switch(e.key){
case "Enter":
// case "Tab":
onChange();
break;

case 27:
case "Escape":
cancel();
break;

case 38: //up arrow
case 40: //down arrow
case "ArrowUp":
case "ArrowDown":
if(vertNav == "editor"){
e.stopImmediatePropagation();
e.stopPropagation();
}
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;
}
Expand Down
12 changes: 6 additions & 6 deletions src/js/modules/Edit/defaults/editors/progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,23 @@ export default function(cell, onRendered, success, cancel, editorParams){

//allow key based navigation
element.addEventListener("keydown", function(e){
switch(e.keyCode){
case 39: //right arrow
switch(e.key){
case "ArrowRight":
e.preventDefault();
bar.style.width = (bar.clientWidth + element.clientWidth/100) + "px";
break;

case 37: //left arrow
case "ArrowLeft":
e.preventDefault();
bar.style.width = (bar.clientWidth - element.clientWidth/100) + "px";
break;

case 9: //tab
case 13: //enter
case "Tab":
case "Enter":
updateValue();
break;

case 27: //escape
case "Escape":
cancel();
break;

Expand Down
8 changes: 4 additions & 4 deletions src/js/modules/Edit/defaults/editors/range.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
case 13:
// case 9:
switch(e.key){
case "Enter":
// case "Tab":
onChange();
break;

case 27:
case "Escape":
cancel();
break;
}
Expand Down
10 changes: 5 additions & 5 deletions src/js/modules/Edit/defaults/editors/star.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,20 @@ export default function(cell, onRendered, success, cancel, editorParams){

//allow key based navigation
element.addEventListener("keydown", function(e){
switch(e.keyCode){
case 39: //right arrow
switch(e.key){
case "ArrowRight":
changeValue(value + 1);
break;

case 37: //left arrow
case "ArrowLeft":
changeValue(value - 1);
break;

case 13: //enter
case "Enter":
success(value);
break;

case 27: //escape
case "Escape":
cancel();
break;
}
Expand Down
14 changes: 7 additions & 7 deletions src/js/modules/Edit/defaults/editors/textarea.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,35 +81,35 @@ export default function(cell, onRendered, success, cancel, editorParams){

input.addEventListener("keydown", function(e){

switch(e.keyCode){
switch(e.key){

case 13:
case "Enter":
if(e.shiftKey && editorParams.shiftEnterSubmit){
onChange(e);
}
break;

case 27:
case "Escape":
cancel();
break;

case 38: //up arrow
case "ArrowUp":
if(vertNav == "editor" || (vertNav == "hybrid" && input.selectionStart)){
e.stopImmediatePropagation();
e.stopPropagation();
}

break;

case 40: //down arrow
case "ArrowDown":
if(vertNav == "editor" || (vertNav == "hybrid" && input.selectionStart !== input.value.length)){
e.stopImmediatePropagation();
e.stopPropagation();
}
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/js/modules/Edit/defaults/editors/tickCross.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
if(e.keyCode == 13){
if(e.key == "Enter"){
success(setValue());
}
if(e.keyCode == 27){
if(e.key == "Escape"){
cancel();
}
});
Expand Down
16 changes: 8 additions & 8 deletions src/js/modules/Edit/defaults/editors/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,23 @@ export default function(cell, onRendered, success, cancel, editorParams){

//submit new value on enter
input.addEventListener("keydown", function(e){
switch(e.keyCode){
// case 9:
case 13:
switch(e.key){
// case "Tab":
case "Enter":
onChange();
break;

case 27:
case "Escape":
cancel();
break;

case 35:
case 36:
case "End":
case "Home":
e.stopPropagation();
break;

case 38: //up arrow
case 40: //down arrow
case "ArrowUp":
case "ArrowDown":
if(vertNav == "editor"){
e.stopImmediatePropagation();
e.stopPropagation();
Expand Down
4 changes: 2 additions & 2 deletions src/js/modules/Edit/inputMask.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function maskInput(el, options){
var index = el.value.length,
char = e.key;

if(e.keyCode > 46 && !e.ctrlKey && !e.metaKey){
if(e.key.length === 1 && !e.ctrlKey && !e.metaKey){
if(index >= mask.length){
e.preventDefault();
e.stopPropagation();
Expand Down Expand Up @@ -56,7 +56,7 @@ export default function maskInput(el, options){
});

el.addEventListener("keyup", (e) => {
if(e.keyCode > 46){
if(e.key.length === 1){
if(options.maskAutoFill){
fillSymbols(el.value.length);
}
Expand Down
Loading
Loading