mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-10 13:35:29 +02:00
Fixed duplicate keys on settings page (closes #https://github.com/zen-browser/desktop/issues/1784)
This commit is contained in:
parent
dcd4dc5d44
commit
99569e4588
3 changed files with 6 additions and 4 deletions
2
l10n
2
l10n
|
@ -1 +1 @@
|
||||||
Subproject commit bee67c4c6eb4f02787cd1e354f03abbd2d3cf0ca
|
Subproject commit 1160be5b47c31d7c7862412cd2a8368606233dd2
|
|
@ -1 +1 @@
|
||||||
Subproject commit 37804deef0d07034621167cca17ff27a242480ec
|
Subproject commit 2a6755d9ba1c27bda1cf52bde2872e6d7b2f6f08
|
|
@ -665,6 +665,7 @@ var zenMissingKeyboardShortcutL10n = {
|
||||||
key_gotoHistory: "zen-key-goto-history",
|
key_gotoHistory: "zen-key-goto-history",
|
||||||
|
|
||||||
goHome: "zen-key-go-home",
|
goHome: "zen-key-go-home",
|
||||||
|
key_redo: "zen-key-redo",
|
||||||
}
|
}
|
||||||
|
|
||||||
var gZenCKSSettings = {
|
var gZenCKSSettings = {
|
||||||
|
@ -728,9 +729,9 @@ var gZenCKSSettings = {
|
||||||
|
|
||||||
let fragment = window.MozXULElement.parseXULToFragment(`
|
let fragment = window.MozXULElement.parseXULToFragment(`
|
||||||
<hbox class="${ZEN_CKS_CLASS_BASE}">
|
<hbox class="${ZEN_CKS_CLASS_BASE}">
|
||||||
<label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${action}"></label>
|
<label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${keyID}"></label>
|
||||||
<vbox flex="1">
|
<vbox flex="1">
|
||||||
<html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${action}" />
|
<html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${keyID}" />
|
||||||
</vbox>
|
</vbox>
|
||||||
</hbox>
|
</hbox>
|
||||||
`);
|
`);
|
||||||
|
@ -841,6 +842,7 @@ var gZenCKSSettings = {
|
||||||
if (!input.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`)) {
|
if (!input.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`)) {
|
||||||
input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
|
input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
|
||||||
}
|
}
|
||||||
|
input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
|
||||||
if (hasConflicts && !input.nextElementSibling) {
|
if (hasConflicts && !input.nextElementSibling) {
|
||||||
input.after(window.MozXULElement.parseXULToFragment(`
|
input.after(window.MozXULElement.parseXULToFragment(`
|
||||||
<label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
|
<label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue