mirror of
https://github.com/gorhill/uBlock.git
synced 2024-07-05 11:37:01 +02:00
[mv3] Add textarea to list/edit trusted sites
Related issue: https://github.com/uBlockOrigin/uBOL-home/issues/29
This commit is contained in:
Raymond Hill
parent
2bd2e6a079
commit
d7acad6c90
|
|
@ -143,6 +143,10 @@
|
|||
"message": "Advanced network filtering plus specific and generic extended filtering from selected filter lists.\n\nRequires broad permission to read and modify data on all websites.\n\nGeneric extended filtering may cause higher webpage resources usage.",
|
||||
"description": "This describes the 'complete' filtering mode"
|
||||
},
|
||||
"noFilteringModeDescription": {
|
||||
"message": "List of hostnames for which no filtering will take place",
|
||||
"description": "A short description for the editable field which lists trusted sites"
|
||||
},
|
||||
"behaviorSectionLabel": {
|
||||
"message": "Behavior",
|
||||
"description": "The header text for the 'Behavior' section"
|
||||
|
|
|
|||
|
|
@ -64,6 +64,16 @@ p {
|
|||
width: calc(240px / 2);
|
||||
}
|
||||
|
||||
h3[data-i18n="filteringMode0Name"]::first-letter {
|
||||
text-transform: capitalize;
|
||||
}
|
||||
#trustedSites {
|
||||
box-sizing: border-box;
|
||||
height: 6rem;
|
||||
resize: vertical;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#lists {
|
||||
margin: 0.5em 0 0 0;
|
||||
padding: 0;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
<link rel="stylesheet" href="css/dashboard-common.css">
|
||||
<link rel="stylesheet" href="css/filtering-mode.css">
|
||||
<link rel="stylesheet" href="css/settings.css">
|
||||
<link rel="stylesheet" href="css/about.css">
|
||||
|
||||
<link rel="shortcut icon" type="image/png" href="img/icon_64.png"/>
|
||||
</head>
|
||||
|
|
@ -20,7 +19,7 @@
|
|||
<body data-pane="settings">
|
||||
<!-- -------- -->
|
||||
<div id="dashboard-nav">
|
||||
<span class="logo"><img data-i18n-title="extName" src="img/ublock.svg"></span><!--
|
||||
<span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBO Lite"></span><!--
|
||||
--><button class="tabButton" type="button" data-pane="settings" data-i18n="settingsPageName" tabindex="0"></button><!--
|
||||
--><button class="tabButton" type="button" data-pane="about" data-i18n="aboutPageName" tabindex="0"></button>
|
||||
</div>
|
||||
|
|
@ -83,6 +82,13 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h3 data-i18n="filteringMode0Name"></h3>
|
||||
<p data-i18n="noFilteringModeDescription">_</p>
|
||||
<p><textarea id="trustedSites" spellcheck="false"></textarea>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h3 data-i18n="behaviorSectionLabel"></h3>
|
||||
<p><label id="autoReload" data-i18n="autoReloadLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ import {
|
|||
setFilteringMode,
|
||||
getDefaultFilteringMode,
|
||||
setDefaultFilteringMode,
|
||||
getTrustedSites,
|
||||
setTrustedSites,
|
||||
syncWithBrowserPermissions,
|
||||
} from './mode-manager.js';
|
||||
|
||||
|
|
@ -151,8 +153,7 @@ function onMessage(request, sender, callback) {
|
|||
}).catch(reason => {
|
||||
console.log(reason);
|
||||
});
|
||||
callback();
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
default:
|
||||
|
|
@ -181,16 +182,19 @@ function onMessage(request, sender, callback) {
|
|||
case 'getOptionsPageData': {
|
||||
Promise.all([
|
||||
getDefaultFilteringMode(),
|
||||
getTrustedSites(),
|
||||
getRulesetDetails(),
|
||||
dnr.getEnabledRulesets(),
|
||||
]).then(results => {
|
||||
const [
|
||||
defaultFilteringMode,
|
||||
trustedSites,
|
||||
rulesetDetails,
|
||||
enabledRulesets,
|
||||
] = results;
|
||||
callback({
|
||||
defaultFilteringMode,
|
||||
trustedSites: Array.from(trustedSites),
|
||||
enabledRulesets,
|
||||
maxNumberOfEnabledRulesets: dnr.MAX_NUMBER_OF_ENABLED_STATIC_RULESETS,
|
||||
rulesetDetails: Array.from(rulesetDetails.values()),
|
||||
|
|
@ -262,6 +266,21 @@ function onMessage(request, sender, callback) {
|
|||
return true;
|
||||
}
|
||||
|
||||
case 'setTrustedSites':
|
||||
setTrustedSites(request.hostnames).then(( ) => {
|
||||
registerInjectables();
|
||||
return Promise.all([
|
||||
getDefaultFilteringMode(),
|
||||
getTrustedSites(),
|
||||
]);
|
||||
}).then(results => {
|
||||
callback({
|
||||
defaultFilteringMode: results[0],
|
||||
trustedSites: Array.from(results[1]),
|
||||
});
|
||||
});
|
||||
return true;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -354,6 +354,35 @@ export function setDefaultFilteringMode(afterLevel) {
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
export async function getTrustedSites() {
|
||||
const filteringModes = await getFilteringModeDetails();
|
||||
return filteringModes.none;
|
||||
}
|
||||
|
||||
export async function setTrustedSites(hostnames) {
|
||||
const filteringModes = await getFilteringModeDetails();
|
||||
const { none } = filteringModes;
|
||||
const hnSet = new Set(hostnames);
|
||||
let modified = false;
|
||||
for ( const hn of none ) {
|
||||
if ( hnSet.has(hn) ) {
|
||||
hnSet.delete(hn);
|
||||
} else {
|
||||
none.delete(hn);
|
||||
modified = true;
|
||||
}
|
||||
}
|
||||
for ( const hn of hnSet ) {
|
||||
const level = applyFilteringMode(filteringModes, hn, MODE_NONE);
|
||||
if ( level !== MODE_NONE ) { continue; }
|
||||
modified = true;
|
||||
}
|
||||
if ( modified === false ) { return; }
|
||||
return writeFilteringModeDetails(filteringModes);
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
export async function syncWithBrowserPermissions() {
|
||||
const [ permissions, beforeMode ] = await Promise.all([
|
||||
browser.permissions.getAll(),
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
import { browser, sendMessage, localRead, localWrite } from './ext.js';
|
||||
import { i18n$, i18n } from './i18n.js';
|
||||
import { dom, qs$, qsa$ } from './dom.js';
|
||||
import punycode from './punycode.js';
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
|
|
@ -204,8 +205,6 @@ function renderFilterLists(soft = false) {
|
|||
}
|
||||
|
||||
dom.remove('#lists .listEntries .listEntry.discard');
|
||||
|
||||
renderWidgets();
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
|
|
@ -216,7 +215,13 @@ const renderWidgets = function() {
|
|||
}
|
||||
|
||||
const defaultLevel = cachedRulesetData.defaultFilteringMode;
|
||||
qs$(`.filteringModeCard input[type="radio"][value="${defaultLevel}"]`).checked = true;
|
||||
if ( defaultLevel !== 0 ) {
|
||||
qs$(`.filteringModeCard input[type="radio"][value="${defaultLevel}"]`).checked = true;
|
||||
} else {
|
||||
dom.prop('.filteringModeCard input[type="radio"]', 'checked', false);
|
||||
}
|
||||
|
||||
renderTrustedSites(cachedRulesetData.trustedSites);
|
||||
|
||||
qs$('#autoReload input[type="checkbox"').checked = cachedRulesetData.autoReload;
|
||||
|
||||
|
|
@ -295,6 +300,45 @@ dom.on('#autoReload input[type="checkbox"', 'change', ev => {
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
let trustedSitesHash = '';
|
||||
|
||||
function renderTrustedSites(hostnames) {
|
||||
const textarea = qs$('#trustedSites');
|
||||
trustedSitesHash = hostnames.sort().join('\n');
|
||||
textarea.value = hostnames.map(hn => punycode.toUnicode(hn)).join('\n');
|
||||
if ( textarea.value !== '' ) {
|
||||
textarea.value += '\n';
|
||||
}
|
||||
}
|
||||
|
||||
function changeTrustedSites() {
|
||||
const textarea = qs$('#trustedSites');
|
||||
const hostnames = textarea.value.split(/\s/).map(hn => {
|
||||
try {
|
||||
return punycode.toASCII(
|
||||
(new URL(`https://${hn}/`)).hostname
|
||||
);
|
||||
} catch(_) {
|
||||
}
|
||||
return '';
|
||||
}).filter(hn => hn !== '').sort();
|
||||
if ( hostnames.join('\n') === trustedSitesHash ) { return; }
|
||||
sendMessage({
|
||||
what: 'setTrustedSites',
|
||||
hostnames,
|
||||
}).then(response => {
|
||||
cachedRulesetData.defaultFilteringMode = response.defaultFilteringMode;
|
||||
cachedRulesetData.trustedSites = response.trustedSites;
|
||||
renderWidgets();
|
||||
});
|
||||
}
|
||||
|
||||
dom.on('#trustedSites', 'blur', changeTrustedSites);
|
||||
|
||||
self.addEventListener('beforeunload', changeTrustedSites);
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
async function applyEnabledRulesets() {
|
||||
const enabledRulesets = [];
|
||||
for ( const liEntry of qsa$('#lists .listEntry[data-listkey]') ) {
|
||||
|
|
@ -385,6 +429,7 @@ sendMessage({
|
|||
cachedRulesetData.rulesetDetails.forEach(rule => rulesetMap.set(rule.id, rule));
|
||||
try {
|
||||
renderFilterLists();
|
||||
renderWidgets();
|
||||
} catch(ex) {
|
||||
}
|
||||
}).catch(reason => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user