зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1281493
- Add another selector for identity popup main view as XBL bindings sometimes have a race condition. Removing surplus identity-popup-security-content selector. r=gijs
MozReview-Commit-ID: DxAX18vGXHN --HG-- extra : transplant_source : %5C%84%F0%E3%FE%B5%05%11%23g9r%5B%0AG%E2%06%92%7E%7E
This commit is contained in:
Родитель
90d7db5624
Коммит
1a20c85c2d
|
@ -6574,13 +6574,25 @@ var gIdentityHandler = {
|
|||
delete this._identityBox;
|
||||
return this._identityBox = document.getElementById("identity-box");
|
||||
},
|
||||
get _identityPopupMultiView () {
|
||||
delete _identityPopupMultiView;
|
||||
return document.getElementById("identity-popup-multiView");
|
||||
},
|
||||
get _identityPopupContentHosts () {
|
||||
delete this._identityPopupContentHosts;
|
||||
return this._identityPopupContentHosts = [...document.querySelectorAll(".identity-popup-headline.host")];
|
||||
let selector = ".identity-popup-headline.host";
|
||||
return this._identityPopupContentHosts = [
|
||||
...this._identityPopupMultiView._mainView.querySelectorAll(selector),
|
||||
...document.querySelectorAll(selector)
|
||||
];
|
||||
},
|
||||
get _identityPopupContentHostless () {
|
||||
delete this._identityPopupContentHostless;
|
||||
return this._identityPopupContentHostless = [...document.querySelectorAll(".identity-popup-headline.hostless")];
|
||||
let selector = ".identity-popup-headline.hostless";
|
||||
return this._identityPopupContentHostless = [
|
||||
...this._identityPopupMultiView._mainView.querySelectorAll(selector),
|
||||
...document.querySelectorAll(selector)
|
||||
];
|
||||
},
|
||||
get _identityPopupContentOwner () {
|
||||
delete this._identityPopupContentOwner;
|
||||
|
@ -6640,7 +6652,7 @@ var gIdentityHandler = {
|
|||
},
|
||||
|
||||
toggleSubView(name, anchor) {
|
||||
let view = document.getElementById("identity-popup-multiView");
|
||||
let view = this._identityPopupMultiView;
|
||||
if (view.showingSubView) {
|
||||
view.showMainView();
|
||||
} else {
|
||||
|
|
|
@ -767,7 +767,6 @@ function assertMixedContentBlockingState(tabbrowser, states = {}) {
|
|||
// Make sure the correct icon is visible in the Control Center.
|
||||
// This logic is controlled with CSS, so this helps prevent regressions there.
|
||||
let securityView = doc.getElementById("identity-popup-securityView");
|
||||
let securityContent = doc.getElementById("identity-popup-security-content");
|
||||
let securityViewBG = tabbrowser.ownerGlobal.getComputedStyle(securityView, "").
|
||||
getPropertyValue("background-image");
|
||||
let securityContentBG = tabbrowser.ownerGlobal.getComputedStyle(securityView, "").
|
||||
|
|
Загрузка…
Ссылка в новой задаче