mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Backed out 2 changesets (bug 1814266) for causing failures in browser_identityPopup_focus.js
Backed out changeset fb7b697636ae (bug 1814266) Backed out changeset 7e5ac07b53d9 (bug 1814266)
This commit is contained in:
parent
073ee7078b
commit
e465420048
@ -166,7 +166,6 @@ var gIdentityHandler = {
|
||||
|
||||
_popupInitialized: false,
|
||||
_initializePopup() {
|
||||
window.ensureCustomElements("moz-support-link");
|
||||
if (!this._popupInitialized) {
|
||||
let wrapper = document.getElementById("template-identity-popup");
|
||||
wrapper.replaceWith(wrapper.content);
|
||||
@ -933,6 +932,11 @@ var gIdentityHandler = {
|
||||
e.setAttribute("href", baseURL + "mixed-content")
|
||||
);
|
||||
|
||||
this._identityPopupCustomRootLearnMore.setAttribute(
|
||||
"href",
|
||||
baseURL + "enterprise-roots"
|
||||
);
|
||||
|
||||
let customRoot = false;
|
||||
|
||||
// Determine connection security information.
|
||||
|
@ -125,9 +125,9 @@
|
||||
when-connection="secure secure-ev secure-cert-user-overridden"/>
|
||||
<description id="identity-popup-content-verifier-unknown"
|
||||
class="identity-popup-warning-box identity-popup-warning-gray"
|
||||
when-customroot="true">
|
||||
<label data-l10n-id="identity-description-custom-root2"/>
|
||||
<html:a is="moz-support-link" id="identity-popup-custom-root-learn-more" support-page="enterprise-roots"/>
|
||||
when-customroot="true"
|
||||
data-l10n-id="identity-description-custom-root">
|
||||
<label data-l10n-name="link" id="identity-popup-custom-root-learn-more" is="text-link"/>
|
||||
</description>
|
||||
|
||||
<!-- Remove Certificate Exception -->
|
||||
|
@ -400,7 +400,7 @@ identity-clear-site-data =
|
||||
identity-connection-not-secure-security-view = You are not securely connected to this site.
|
||||
identity-connection-verified = You are securely connected to this site.
|
||||
identity-ev-owner-label = Certificate issued to:
|
||||
identity-description-custom-root2 = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.
|
||||
identity-description-custom-root = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator. <label data-l10n-name="link">Learn More</label>
|
||||
identity-remove-cert-exception =
|
||||
.label = Remove Exception
|
||||
.accesskey = R
|
||||
|
@ -282,10 +282,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
#identity-popup-content-verifier-unknown > label {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
/* CONTENT BLOCKING / TRACKING PROTECTION */
|
||||
|
||||
#protections-popup-sendReportView-heading,
|
||||
|
@ -1,34 +0,0 @@
|
||||
# Any copyright is dedicated to the Public Domain.
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
||||
|
||||
import fluent.syntax.ast as FTL
|
||||
|
||||
from fluent.migrate.transforms import TransformPattern
|
||||
|
||||
|
||||
class STRIP_LEARNMORE(TransformPattern):
|
||||
# Used to remove `<a data-l10n-name="link">SOME TEXT</a>` from a string
|
||||
def visit_TextElement(self, node):
|
||||
link_start = node.value.find('<label data-l10n-name="link">')
|
||||
# Replace string up to the link, remove remaining spaces afterwards.
|
||||
# Removing an extra character directly is not safe, as it could be
|
||||
# punctuation.
|
||||
node.value = node.value[:link_start].rstrip()
|
||||
|
||||
return node
|
||||
|
||||
|
||||
def migrate(ctx):
|
||||
"""Bug 1814266 - Use moz-support-link in identity panel, part {index}."""
|
||||
|
||||
browser_ftl = "browser/browser/browser.ftl"
|
||||
ctx.add_transforms(
|
||||
browser_ftl,
|
||||
browser_ftl,
|
||||
[
|
||||
FTL.Message(
|
||||
id=FTL.Identifier("identity-description-custom-root2"),
|
||||
value=STRIP_LEARNMORE(browser_ftl, "identity-description-custom-root"),
|
||||
),
|
||||
],
|
||||
)
|
@ -53,8 +53,8 @@ export default class MozSupportLink extends HTMLAnchorElement {
|
||||
this.addEventListener("click", this);
|
||||
if (!this.getAttribute("data-l10n-id")) {
|
||||
document.l10n.setAttributes(this, "moz-support-link-text");
|
||||
document.l10n.translateFragment(this);
|
||||
}
|
||||
document.l10n.translateFragment(this);
|
||||
}
|
||||
|
||||
disconnectedCallback() {
|
||||
|
@ -147,7 +147,7 @@ CO01:
|
||||
- extension-firefox-alpenglow-name
|
||||
# browser/locales/en-US/browser/browser.ftl
|
||||
- identity-custom-root
|
||||
- identity-description-custom-root2
|
||||
- identity-description-custom-root
|
||||
# browser/locales/en-US/browser/migration.ftl
|
||||
- import-from-firefox
|
||||
# browser/locales/en-US/browser/migrationWizard.ftl
|
||||
|
Loading…
Reference in New Issue
Block a user