From 1bc0ac1ec595d0c588599631add7f39d2a2c4284 Mon Sep 17 00:00:00 2001 From: mattpass Date: Sun, 4 Oct 2020 08:59:15 +0100 Subject: [PATCH] Shorter version of key identifying via null coalescing --- assets/js/icecoder.js | 6 +++--- lib/login.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/icecoder.js b/assets/js/icecoder.js index fc78989..6fe9bf6 100644 --- a/assets/js/icecoder.js +++ b/assets/js/icecoder.js @@ -2677,7 +2677,7 @@ var ICEcoder = { draggingWithKeyTest: function(evt) { let key; - key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode; + key = evt.keyCode ?? evt.which ?? evt.charCode; key = parseInt(key, 10); // Mac command key handling (224 = Moz, 91/93 = Webkit Left/Right Apple) @@ -4920,7 +4920,7 @@ var ICEcoder = { resetKeys: function(evt) { var key, cM; - key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode; + key = evt.keyCode ?? evt.which ?? evt.charCode; if (key == 112 && true === this.codeZoomedOut) { cM = this.getcMInstance(); @@ -4949,7 +4949,7 @@ var ICEcoder = { }, handleModalKeyUp: function(evt, page) { - const key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode; + const key = evt.keyCode ?? evt.which ?? evt.charCode; const target = get('blackMask') ? get('blackMask') : parent.get('blackMask'); if ("settings" === page && 13 === key) { diff --git a/lib/login.php b/lib/login.php index 5448463..7521aa9 100644 --- a/lib/login.php +++ b/lib/login.php @@ -113,7 +113,7 @@ const pwStrength = function(pw) { }; const checkCase = function(evt) { - const key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode; + const key = evt.keyCode ?? evt.which ?? evt.charCode; // Not caps lock key if (20 !== key) {