tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Popup: Fix issue where 'sites' tab would be disabled if extension mode was set to whitelist only

Browse Source
This commit is contained in:
Tamius Han 2019-09-21 19:55:47 +02:00
parent c407e7a298
commit 685cfc9466
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/popup/App.vue
View File

@ -347,13 +347,21 @@ export default {
// Extension site disabled, embedded videos from non-blacklisted hosts — show video settings // Extension site disabled, embedded videos from non-blacklisted hosts — show video settings
// Extension site enabled — show vido settings // Extension site enabled — show vido settings
// note: this if statement is ever so slightly unnecessary
if (! this.settings.canStartExtension('@global')) { if (! this.settings.canStartExtension('@global')) {
if (this.selectedTab === 'video' || this.selectedTab === 'site') { // canStartExtension and getExtensionMode return disabled/false for non-whitelisted
this.selectTab('global'); // sites, even if extension mode is set to "whitelist only." This is problematic
// because in order to whitelist a given site, we need to set extension to global-
// enabled, whitelist the site, and then set extension to whitelist only. This makes
// for a bad user experience, so let's fix this.
if (this.settings.active.sites['@global'].mode === ExtensionMode.Disabled) {
if (this.selectedTab === 'video' || this.selectedTab === 'site') {
this.selectTab('global');
}
this.siteTabDisabled = true;
this.videoTabDisabled = true;
return;
} }
this.siteTabDisabled = true;
this.videoTabDisabled = true;
return;
} }
this.siteTabDisabled = false;; this.siteTabDisabled = false;;