From 33590aa353967f5a6162d7388e5db2a9aed1f03c Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 15 Jun 2019 22:58:19 +0200 Subject: [PATCH] UX: In popup, indicate which sites (and corresponding frames) are disabled. This will need additional work on content scripts tho --- src/ext/lib/Settings.js | 2 +- src/popup/App.vue | 93 +++++++++++++++++++++++++++++++++++++---- src/res/css/common.scss | 4 ++ 3 files changed, 90 insertions(+), 9 deletions(-) diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js index 91b6eba..19f28af 100644 --- a/src/ext/lib/Settings.js +++ b/src/ext/lib/Settings.js @@ -294,7 +294,7 @@ class Settings { return this.active.sites['@global'].mode === ExtensionMode.Enabled; } - if(this.active.sites['@global'].mode === ExtensionMode.Enabled) { + if (this.active.sites['@global'].mode === ExtensionMode.Enabled) { return this.active.sites[site].mode !== ExtensionMode.Disabled; } else if (this.active.sites['@global'].mode === ExtensionMode.Whitelist) { return this.active.sites[site].mode === ExtensionMode.Enabled; diff --git a/src/popup/App.vue b/src/popup/App.vue index 0d01dc3..67d3402 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -18,7 +18,7 @@