From 72087ab3d4c5eee4a8c2356321dbb2af40aa3d8b Mon Sep 17 00:00:00 2001 From: ayushchatur Date: Mon, 23 Aug 2021 14:12:19 -0400 Subject: [PATCH 1/2] bugfix --- apps/shell/public/javascripts/hterm_all_1.85.mod.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/shell/public/javascripts/hterm_all_1.85.mod.js b/apps/shell/public/javascripts/hterm_all_1.85.mod.js index e4b2cd8755..35daf0a78b 100644 --- a/apps/shell/public/javascripts/hterm_all_1.85.mod.js +++ b/apps/shell/public/javascripts/hterm_all_1.85.mod.js @@ -6952,10 +6952,6 @@ hterm.Keyboard.KeyMap.prototype.reset = function() { var keycapEP = 61; // =+ var keycapMU = 173; // -_ - this.addKeyDefs( - // Firefox Italian +*. - [171, '+*', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')] - ); } else { // All other browsers use these mappings. var keycapMute = 173; // Mute @@ -6975,7 +6971,11 @@ hterm.Keyboard.KeyMap.prototype.reset = function() { var DEFAULT = hterm.Keyboard.KeyActions.DEFAULT; var PASS = hterm.Keyboard.KeyActions.PASS; var STRIP = hterm.Keyboard.KeyActions.STRIP; - + + this.addKeyDefs( + // Firefox Italian +*. + [171, '+*', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')] + ); this.addKeyDefs( // These fields are: [keycode, keycap, normal, control, alt, meta] From a9e2e3980b0f491d0478a20e21aad022285b64ee Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Tue, 24 Aug 2021 16:32:58 -0400 Subject: [PATCH 2/2] move fix to new location with an extra comment --- apps/shell/public/javascripts/hterm_all_1.85.mod.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/shell/public/javascripts/hterm_all_1.85.mod.js b/apps/shell/public/javascripts/hterm_all_1.85.mod.js index 35daf0a78b..d986a42d7d 100644 --- a/apps/shell/public/javascripts/hterm_all_1.85.mod.js +++ b/apps/shell/public/javascripts/hterm_all_1.85.mod.js @@ -6971,11 +6971,7 @@ hterm.Keyboard.KeyMap.prototype.reset = function() { var DEFAULT = hterm.Keyboard.KeyActions.DEFAULT; var PASS = hterm.Keyboard.KeyActions.PASS; var STRIP = hterm.Keyboard.KeyActions.STRIP; - - this.addKeyDefs( - // Firefox Italian +*. - [171, '+*', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')] - ); + this.addKeyDefs( // These fields are: [keycode, keycap, normal, control, alt, meta] @@ -7016,6 +7012,10 @@ hterm.Keyboard.KeyMap.prototype.reset = function() { [keycapMU, '-_', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')], [keycapEP, '=+', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')], + // was Firefox Italian +* but applies to all browsers (and lots of EU keyboard layouts). + // see https://github.com/OSC/ondemand/issues/1214 + [171, '+*', DEFAULT, c('onPlusMinusZero_'), DEFAULT, c('onPlusMinusZero_')], + [8, '[BKSP]', bs('\x7f', '\b'), bs('\b', '\x7f'), DEFAULT, DEFAULT], // Third row.