Skip to content

Commit c9fe95c

Browse files
committed
closes #8713 - Fixed profile context menu not showing, c=common, t=fix
1 parent 9bfa7b0 commit c9fe95c

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/browser/components/preferences/zen-settings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,12 @@ var gZenCKSSettings = {
10451045
const modifiersActive = modifiers.areAnyActive();
10461046

10471047
input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
1048-
1048+
10491049
// First, try to read the *physical* key via event.code.
10501050
// If event.code is like "KeyS", "KeyA", ..., strip off "Key" → "S".
10511051
// Otherwise, fall back to event.key (e.g. "F5", "Enter", etc.).
10521052
let shortcut;
1053-
if (event.code && event.code.startsWith("Key")) shortcut = event.code.slice(3);
1053+
if (event.code && event.code.startsWith('Key')) shortcut = event.code.slice(3);
10541054
else shortcut = event.key;
10551055

10561056
shortcut = shortcut.replace(/Ctrl|Control|Shift|Alt|Option|Cmd|Meta/, ''); // Remove all modifiers

src/zen/common/ZenUIMigration.mjs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
44
const lazy = {};
55

6+
var { AppConstants } = ChromeUtils.importESModule('resource://gre/modules/AppConstants.sys.mjs');
7+
68
ChromeUtils.defineESModuleGetters(lazy, {
79
BrowserWindowTracker: 'resource:///modules/BrowserWindowTracker.sys.mjs',
810
});
@@ -13,7 +15,11 @@ class ZenUIMigration {
1315

1416
init(isNewProfile, win) {
1517
if (!isNewProfile) {
16-
this._migrate(win);
18+
try {
19+
this._migrate(win);
20+
} catch (e) {
21+
console.error('ZenUIMigration: Error during migration', e);
22+
}
1723
}
1824
this.clearVariables();
1925
}

0 commit comments

Comments
 (0)