Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1207542 - Hide the Control Center when the URL changes;r=paolo

Browse Source 
--HG--
extra : commitid : EJQAAQCrgQG
This commit is contained in:
Brian Grinstead 2015-10-16 16:48:45 -07:00
parent c84dda70dd
commit 022d2f58de
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7021,6 +7021,7 @@ var gIdentityHandler = {
* processed by nsIURIFixup.createExposableURI.
*/
updateIdentity(state, uri) {
let shouldHidePopup = this._uri && (this._uri.spec != uri.spec);
this._state = state;
this._uri = uri;
@ -7045,15 +7046,19 @@ var gIdentityHandler = {
}
// Then, update the user interface with the available data.
if (this._identityBox) {
this.refreshIdentityBlock();
}
// Handle a location change while the Control Center is focused
// by closing the popup (bug 1207542)
if (shouldHidePopup) {
this._identityPopup.hidePopup();
}
// NOTE: We do NOT update the identity popup (the control center) when
// we receive a new security state. If the user opened the popup and looks
// at the provided information we don't want to suddenly change the panel
// contents.
// we receive a new security state on the existing page (i.e. from a
// subframe). If the user opened the popup and looks at the provided
// information we don't want to suddenly change the panel contents.
},
/**

42
browser/base/content/test/general/browser_identity_UI.js
View File

@ -1,14 +1,15 @@
/* Tests for correct behaviour of getEffectiveHost on identity handler */
function test() {
waitForExplicitFinish();
requestLongerTimeout(2);
ok(gIdentityHandler, "gIdentityHandler should exist");
gBrowser.selectedTab = gBrowser.addTab();
gBrowser.selectedBrowser.addEventListener("load", checkResult, true);
nextTest();
BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank", true).then(() => {
gBrowser.selectedBrowser.addEventListener("load", checkResult, true);
nextTest();
});
}
// Greek IDN for 'example.test'.
@ -59,7 +60,7 @@ var tests = [
},
]
var gCurrentTest, gCurrentTestIndex = -1, gTestDesc;
var gCurrentTest, gCurrentTestIndex = -1, gTestDesc, gPopupHidden;
// Go through the tests in both directions, to add additional coverage for
// transitions between different states.
var gForward = true;
@ -91,7 +92,25 @@ function nextTest() {
if (gCurrentTest.isHTTPS) {
gCheckETLD = true;
}
content.location = gCurrentTest.location;
// Navigate to the next page, which will cause checkResult to fire.
let spec = gBrowser.selectedBrowser.currentURI.spec;
if (spec == "about:blank" || spec == gCurrentTest.location) {
BrowserTestUtils.loadURI(gBrowser.selectedBrowser, gCurrentTest.location);
} else {
// Open the Control Center and make sure it closes after nav (Bug 1207542).
let popupShown = promisePopupShown(gIdentityHandler._identityPopup);
gPopupHidden = promisePopupHidden(gIdentityHandler._identityPopup);
gIdentityHandler._identityBox.click();
info("Waiting for the Control Center to be shown");
popupShown.then(() => {
is_element_visible(gIdentityHandler._identityPopup, "Control Center is visible");
// Show the subview, which is an easy way in automation to reproduce
// Bug 1207542, where the CC wouldn't close on navigation.
gBrowser.ownerDocument.querySelector("#identity-popup-security-expander").click();
BrowserTestUtils.loadURI(gBrowser.selectedBrowser, gCurrentTest.location);
});
}
} else {
gCheckETLD = false;
gTestDesc = "#" + gCurrentTestIndex + " (" + gCurrentTest.name + " without eTLD in identity icon label)";
@ -113,5 +132,14 @@ function checkResult() {
is(gIdentityHandler.getEffectiveHost(), gCurrentTest.effectiveHost, "effectiveHost matches for test " + gTestDesc);
}
executeSoon(nextTest);
if (gPopupHidden) {
info("Waiting for the Control Center to hide");
gPopupHidden.then(() => {
gPopupHidden = null;
is_element_hidden(gIdentityHandler._identityPopup, "control center is hidden");
executeSoon(nextTest);
});
} else {
executeSoon(nextTest);
}
}