corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
MozReview-Commit-ID: DxAX18vGXHN
This commit is contained in:
Jonathan Kingston
2016-06-28 14:18:02 +01:00
parent e2969b0d21
commit 1c9fbb13eb
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
browser/base/content/browser.js
View File

@@ -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 {

1
browser/base/content/test/general/head.js
View File

@@ -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, "").