Merge branch 'master' of github.com:EFForg/https-everywhere

jsha · jsha · commit 9ae03b93cb1c · 2014-12-22T13:23:24.000-08:00
diff --git a/src/chrome/content/code/AndroidUI.jsm b/src/chrome/content/code/AndroidUI.jsm
@@ -27,6 +27,16 @@ function loadIntoWindow() {
   } else if (urlbarId) {
     aWindow.NativeWindow.pageactions.remove(urlbarId);
   }
+
+  // When navigating away from a page, we want to clear the applicable list for
+  // that page. There are a few different APIs to do this, but this is the one
+  // that work on mobile. We trigger on pagehide rather than pageshow because we
+  // want to capture subresources during load.
+  var BrowserApp = aWindow.BrowserApp;
+  BrowserApp.deck.addEventListener("pagehide", function(evt) {
+    var browser = BrowserApp.getBrowserForDocument(evt.target);
+    HTTPSEverywhere.resetApplicableList(browser);
+  }, true);
 }
 
 function unloadFromWindow() {
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -95,7 +95,7 @@ httpsEverywhere.toolbarButton = {
       let httpseProgressListener = {
         onLocationChange: function(aBrowser, aWebProgress, aReq, aLoc) {
           HTTPSEverywhere.log(DBUG, "Got on location change!");
-          HTTPSEverywhere.onLocationChange(aBrowser);
+          HTTPSEverywhere.resetApplicableList(aBrowser);
         },
         onStateChange: function(aBrowser, aWebProgress, aReq, aFlags, aStatus) {
           if ((gBrowser.selectedBrowser === aBrowser) &&
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -302,11 +302,11 @@ HTTPSEverywhere.prototype = {
     obj[key] = value;
   },
 
-  // We use onLocationChange to make a fresh list of rulesets that could have
+  // We use resetApplicableList to make a fresh list of rulesets that could have
   // applied to the content in the current page (the "applicable list" is used
   // for the context menu in the UI).  This will be appended to as various
   // content is embedded / requested by JavaScript.
-  onLocationChange: function(browser) {
+  resetApplicableList: function(browser) {
     if (!this.prefs.getBoolPref("globalEnabled")) {
       return;
     }
