Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1282611 - Recheck for captive portal after watcher is initialized. r=MattN

Browse Source 
MozReview-Commit-ID: DKUibGPvTrx
This commit is contained in:
Nihanth Subramanya 2016-06-27 16:09:23 -07:00 committed by Panos Astithas
parent c470de115e
commit d201f3429d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/modules/CaptivePortalWatcher.jsm
View File

@ -47,10 +47,14 @@ this.CaptivePortalWatcher = {
Services.obs.addObserver(this, "captive-portal-login-abort", false);
Services.obs.addObserver(this, "captive-portal-login-success", false);
this._initialized = true;
if (cps.state == cps.LOCKED_PORTAL) {
// A captive portal has already been detected.
this._addCaptivePortalTab();
return;
}
cps.recheckCaptivePortal();
},
uninit() {
@ -110,8 +114,8 @@ this.CaptivePortalWatcher = {
}
let win = RecentWindow.getMostRecentBrowserWindow();
if (!win.document.hasFocus()) {
// The document that got focused was not in a browser window.
if (win != Services.ww.activeWindow) {
// The window that got focused was not a browser window.
return;
}
Services.obs.removeObserver(this, "xul-window-visible");