From 494641da348e9592a1c07b3b62b2720ab2fb44ac Mon Sep 17 00:00:00 2001
From: eight <eight04@gmail.com>
Date: Mon, 8 Apr 2019 16:38:22 +0800
Subject: [PATCH] Add: exclude the entire site command

---
 _locales/en/messages.json |  5 ++++-
 popup.html                | 11 +++++++++++
 popup/popup.js            | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index f0d66282..9f2e1a81 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -316,7 +316,10 @@
     "description": "Label for the button to enable a style"
   },
   "excludeStyleByDomainLabel": {
-    "message": "Exclude this site"
+    "message": "Exclude by current domain"
+  },
+  "excludeStyleBySiteLabel": {
+    "message": "Exclude the entire site"
   },
   "excludeStyleByUrlLabel": {
     "message": "Exclude by current URL-prefix"
diff --git a/popup.html b/popup.html
index c9d4f720..d4727f04 100644
--- a/popup.html
+++ b/popup.html
@@ -48,6 +48,15 @@
         </div>
       </div>
       <div class="menu">
+        <label class="menu-item exclude-by-site button">
+          <div class="menu-icon">
+            <div class="checkbox-container">
+              <input type="checkbox" class="exclude-by-site-checkbox">
+              <svg class="svg-icon checked"><use xlink:href="#svg-icon-checked"/></svg>
+            </div>
+          </div>
+          <span i18n-text="excludeStyleBySiteLabel"></span>
+        </label>
         <label class="menu-item exclude-by-domain button">
           <div class="menu-icon">
             <div class="checkbox-container">
@@ -171,6 +180,8 @@
   <script src="vendor-overwrites/colorpicker/colorconverter.js"></script>
   <script src="vendor-overwrites/colorpicker/colorpicker.js"></script>
 
+  <script src="vendor/psl/psl.min.js"></script>
+
   <link rel="stylesheet" href="msgbox/msgbox.css">
   <script src="msgbox/msgbox.js"></script>
 
diff --git a/popup/popup.js b/popup/popup.js
index df7d0427..06df18bb 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -1,7 +1,7 @@
 /* global configDialog hotkeys onTabReady msg
   getActiveTab FIREFOX getTabRealURL URLS API onDOMready $ $$ prefs CHROME
   setupLivePrefs template t $create tWordBreak animateElement
-  tryJSONparse debounce */
+  tryJSONparse debounce psl */
 
 'use strict';
 
@@ -312,6 +312,7 @@ function createStyleElement(style) {
 
     $('.menu-button', entry).onclick = handleEvent.toggleMenu;
 
+    $('.exclude-by-site-checkbox', entry).onchange = e => handleEvent.toggleExclude(e, 'site');
     $('.exclude-by-domain-checkbox', entry).onchange = e => handleEvent.toggleExclude(e, 'domain');
     $('.exclude-by-url-checkbox', entry).onchange = e => handleEvent.toggleExclude(e, 'url');
   }
@@ -337,6 +338,9 @@ function createStyleElement(style) {
   $('.exclude-by-domain-checkbox', entry).checked = styleExcluded(style, 'domain');
   $('.exclude-by-domain', entry).title = getExcludeRule('domain');
 
+  $('.exclude-by-site-checkbox', entry).checked = styleExcluded(style, 'site');
+  $('.exclude-by-site', entry).title = getExcludeRule('site');
+
   const excludeByUrlCheckbox = $('.exclude-by-url-checkbox', entry);
   const isRedundant = getExcludeRule('domain') === getExcludeRule('url');
   excludeByUrlCheckbox.checked = !isRedundant && styleExcluded(style, 'url');
@@ -361,11 +365,19 @@ function styleExcluded({exclusions}, type) {
 function getExcludeRule(type) {
   const u = new URL(tabURL);
   if (type === 'domain') {
-    return u.protocol + '//*.' + u.host + '/*';
+    return u.protocol + '//' + u.host + '/*';
+  }
+  if (type === 'site') {
+    // FIXME: what should we do if `getRootDomain` return undefined?
+    return u.protocol + '//*.' + getRootDomain(u.host) + '/*';
   }
   return escapeGlob(u.origin + u.pathname) + '*';
 }
 
+function getRootDomain(domain) {
+  return psl.parse(domain).domain;
+}
+
 function escapeGlob(text) {
   return text.replace(/\*/g, '\\*');
 }