Feature: Navigate to HTTP in EASE Once

.github/pull_request_template.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ***Delete section if irrelevant***
 
 ### List related PRs if any
@@ -9,10 +10,22 @@
 - issue link
 
 ***May delete note after reading***
+=======
+## List related PRs if any
+
+- pr link
+
+## List related issues if any
+
+- issue link
+
+*May delete note after reading*
+>>>>>>> 342a077a389b0b9441be8c935e300234c7e65a23
 
 ### Note to contributor:
 Thank you for contributing! If this is a new ruleset and your first time contributing, congratulations! There will be some tests ran through our continuous integration in Travis. For example, checking for duplicate hosts, problematic hosts, etc. in the ruleset file. You will see this testing begin when you open this pull request.
 
+<<<<<<< HEAD
 If this is not your first time and you have open PRs that have not been closed or merged, please revisit them by searching: `https://github.com/EFForg/https-everywhere/issues?q=is%3Aopen+assignee%3A[yourusernamehere]`. If there is something not being addressed by other maintainers or a project lead, link them to the PR with your question. Thank you for your patience.
 
 More helpful filters in Pull Request search:
@@ -24,3 +37,6 @@ More helpful filters in Pull Request search:
  `is:pr is:merged author:[your username]`
 - Approved PRs: 
 `is:pr review:approved author:[your username]`
+=======
+If this is not your first time and you have open PRs that have not been closed or merged, please revisit them by searching: https://github.com/EFForg/https-everywhere/issues?q=is%3Aopen+assignee%3A[yourusernamehere]. If there is something not being addressed by other maintainers or a project lead, link them to the PR with your question. Thank you for your patience.
+>>>>>>> 342a077a389b0b9441be8c935e300234c7e65a23

chromium/background-scripts/background.js

@@ -117,7 +117,16 @@ if (chrome.windows) {
   });
 
   // Grant access to HTTP site only during session, clear once window is closed
-  chrome.windows.onRemoved.addListener( () => httpOnceList.clear() );
+  chrome.windows.onRemoved.addListener(function() {
+    chrome.windows.getAll({}, function(windows) {
+      if(windows.length > 0) {
+        return;
+      } else {
+        httpOnceList.clear();
+      }
+    });
+  });
+
 }
 chrome.webNavigation.onCompleted.addListener(function() {
   updateState();
@@ -152,7 +161,7 @@ function updateState () {
     const tabUrl = new URL(tabs[0].url);
     const hostname = util.getNormalisedHostname(tabUrl.hostname);
 
-    if (disabledList.has(tabUrl.host) || httpOnceList.has(tabUrl.host) || iconState == "disabled") {
+    if (disabledList.has(hostname) || httpOnceList.has(hostname) || iconState == "disabled") {
       if ('setIcon' in chrome.browserAction) {
         chrome.browserAction.setIcon({
           path: {
@@ -320,9 +329,8 @@ function onBeforeRequest(details) {
     browserSession.putTab(details.tabId, 'first_party_host', uri.host, true);
   }
 
-  if (
-    disabledList.has(browserSession.getTab(details.tabId, 'first_party_host', null)) || 
-    httpOnceList.has(browserSession.getTab(details.tabId, 'first_party_host', null))) 
+  if (disabledList.has(browserSession.getTab(details.tabId, 'first_party_host', null)) ||
+    httpOnceList.has(browserSession.getTab(details.tabId, 'first_party_host', null)))
   {
     return;
   }
@@ -571,9 +579,8 @@ function onHeadersReceived(details) {
 
     // Do not upgrade resources if the first-party domain disbled EASE mode
     // This is needed for HTTPS sites serve mixed content and is broken
-    if (
-    disabledList.has(browserSession.getTab(details.tabId, 'first_party_host', null)) ||
-    httpOnceList.has(browserSession.getTab(details.tabId, 'first_party_host', null))) 
+    if (disabledList.has(browserSession.getTab(details.tabId, 'first_party_host', null)) ||
+      httpOnceList.has(browserSession.getTab(details.tabId, 'first_party_host', null)))
     {
       return {};
     }
@@ -669,7 +676,7 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
     const disabledListArray = Array.from(disabledList);
     const httpOnceListArray = Array.from(httpOnceList);
 
-    if ('once' === message) {
+    if (message === 'once') {
       store.set({httpOnceList: httpOnceListArray}, () => {
         sendResponse(true);
       });
@@ -860,11 +867,11 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
       return storeDisabledList('once');
     },
     disable_on_site: () => {
-      disabledList.add(message.object);
+      disabledList.add(util.getNormalisedHostname(message.object));
       return storeDisabledList('disable');
     },
     enable_on_site: () => {
-      disabledList.delete(message.object);
+      disabledList.delete(util.getNormalisedHostname(message.object));
       return storeDisabledList('enable');
     },
     check_if_site_disabled: () => {
@@ -900,6 +907,7 @@ function destroy_caches() {
   all_rules.ruleCache.clear();
   rules.settings.domainBlacklist.clear();
   urlBlacklist.clear();
+  httpOnceList.clear();
 }
 
 Object.assign(exports, {

chromium/pages/cancel/style.css

@@ -5,7 +5,6 @@ body{
 }
 
 .content{
-  width: 600px;
   margin: auto;
   text-align: left;
 }
@@ -27,17 +26,25 @@ form, button, p{
 }
 
 form{
-  overflow: auto;
+  display: inline-flex;
   margin-bottom: 1em;
+  overflow: auto;
+}
+form#http-once {
+  margin-left: 8px;
+}
+form#url-actions-form {
+  border-right: solid #ec1e1e 1px;
+  padding-right: 8px;
 }
 
 form button{
-  padding: .5em 1em;
   background-color: #aaa;
-  color: #fff;
   border: none;
   border-radius: 4px;
+  color: #fff;
   cursor: pointer;
+  padding: .5em 1em;
 }
 
 #url-value{
@@ -56,3 +63,23 @@ form button{
   border: 1px solid #ec1e1e;
   color: #ec1e1e;
 }
+
+@media screen and (min-width: 600px) {
+  .content {
+    width: 600px;
+  }
+}
+
+@media screen and (max-width: 600px) {
+  .content, img {
+    width: 100%;
+  }
+  form#url-actions-form {
+    border: none;
+  }
+  form#http-once {
+    margin-left: 0;
+  }
+}
+
+