Skip to content
Snippets Groups Projects
Verified Commit 0f786092 authored by Thomas Rientjes's avatar Thomas Rientjes
Browse files

Resolve #157 by allowing users to re-enable prefetching

parent 569bbcbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/main.js
+ 33
− 2
View file @ 0f786092
...@@ -19,10 +19,43 @@ ...@@ -19,10 +19,43 @@
var main = {}; var main = {};
/**
* Private Methods
*/
main._initializeOptions = function () {
let optionDefaults = {
'showIconBadge': true,
'blockMissing': false,
'disablePrefetch': true,
'stripMetadata': true,
'whitelistedDomains': {}
};
chrome.storage.local.get(optionDefaults, function (options) {
if (options === null) {
options = optionDefaults;
}
if (options.disablePrefetch !== false) {
chrome.privacy.network.networkPredictionEnabled.set({
'value': false
});
}
chrome.storage.local.set(options);
});
};
/** /**
* Initializations * Initializations
*/ */
main._initializeOptions();
chrome.runtime.getPlatformInfo(function (information) { chrome.runtime.getPlatformInfo(function (information) {
main.operatingSystem = information.os; main.operatingSystem = information.os;
}); });
...@@ -41,8 +74,6 @@ if (typeof chrome.browserAction.setBadgeBackgroundColor !== 'function') { ...@@ -41,8 +74,6 @@ if (typeof chrome.browserAction.setBadgeBackgroundColor !== 'function') {
}); });
} }
chrome.privacy.network.networkPredictionEnabled.set({'value': false});
chrome.browserAction.setBadgeBackgroundColor({ chrome.browserAction.setBadgeBackgroundColor({
'color': [74, 130, 108, 255] 'color': [74, 130, 108, 255]
}); });
pages/options/options.css
+ 29
− 18
View file @ 0f786092
...@@ -4,8 +4,14 @@ ...@@ -4,8 +4,14 @@
body { body {
color: #555; color: #555;
cursor: default;
font-family: 'Noto Sans', Arial, sans-serif !important; font-family: 'Noto Sans', Arial, sans-serif !important;
font-size: 12px; font-size: 12px;
padding: 10px !important;
}
.option {
margin-bottom: 22px;
} }
/** /**
...@@ -13,27 +19,27 @@ body { ...@@ -13,27 +19,27 @@ body {
*/ */
@font-face { @font-face {
font-family: 'Noto Sans'; font-family: 'Noto Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('../../modules/noto-sans/noto-sans.woff2') src: url('../../modules/noto-sans/noto-sans.woff2')
format('woff2'); format('woff2');
} }
@font-face { @font-face {
font-family: 'Noto Sans'; font-family: 'Noto Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: url('../../modules/noto-sans/noto-sans-bold.woff2') src: url('../../modules/noto-sans/noto-sans-bold.woff2')
format('woff2'); format('woff2');
} }
@font-face { @font-face {
font-family: 'Noto Sans'; font-family: 'Noto Sans';
font-style: italic; font-style: italic;
font-weight: 400; font-weight: 400;
src: url('../../modules/noto-sans/noto-sans-italic.woff2') src: url('../../modules/noto-sans/noto-sans-italic.woff2')
format('woff2'); format('woff2');
} }
/** /**
...@@ -52,6 +58,7 @@ body { ...@@ -52,6 +58,7 @@ body {
.input-checkbox { .input-checkbox {
margin: 0 4px 0 0; margin: 0 4px 0 0;
outline: 0;
} }
.input-text { .input-text {
...@@ -65,11 +72,10 @@ body { ...@@ -65,11 +72,10 @@ body {
.description-option { .description-option {
color: #777; color: #777;
font-style: italic; font-style: italic;
margin-bottom: 18px;
padding-left: 29px; padding-left: 29px;
} }
.label { .badge {
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
font-size: 8px; font-size: 8px;
...@@ -78,6 +84,11 @@ body { ...@@ -78,6 +84,11 @@ body {
text-transform: uppercase; text-transform: uppercase;
} }
.label-warning { .badge-warning {
background-color: #ffa500; background-color: #ffa500;
} }
.label-checkbox {
align-items: center;
display: flex;
}
pages/options/options.html
+ 70
− 10
View file @ 0f786092
...@@ -17,25 +17,85 @@ ...@@ -17,25 +17,85 @@
<script src="options.js"></script> <script src="options.js"></script>
<section> <section class="option">
<label class="title-option"> <div class="title-option">
<input class="input-checkbox" data-option="blockMissing" type="checkbox"> <label class="label-checkbox">
<span data-i18n-content="blockMissingTitle"></span>
<span class="label label-warning" data-i18n-content="advancedLabel"></span>
</label> <input class="input-checkbox" data-option="showIconBadge" type="checkbox" disabled>
<span data-i18n-content="showIconBadgeTitle"></span>
</label>
</div>
<div class="description-option" data-i18n-content="showIconBadgeDescription"></div>
</section>
<section class="option">
<div class="title-option">
<label class="label-checkbox">
<input class="input-checkbox" data-option="blockMissing" type="checkbox">
<span data-i18n-content="blockMissingTitle"></span>
</label>
<span class="badge badge-warning" data-i18n-content="advancedLabel"></span>
</div>
<div class="description-option" data-i18n-content="blockMissingDescription"></div> <div class="description-option" data-i18n-content="blockMissingDescription"></div>
</section> </section>
<section> <section class="option">
<div class="title-option">
<label class="label-checkbox">
<input class="input-checkbox" data-option="disablePrefetch" type="checkbox">
<span data-i18n-content="disablePrefetchTitle"></span>
</label>
<span class="badge badge-warning" data-i18n-content="advancedLabel"></span>
</div>
<div class="description-option" data-i18n-content="disablePrefetchDescription"></div>
</section>
<section class="option">
<div class="title-option">
<label class="label-checkbox">
<input class="input-checkbox" data-option="stripMetadata" type="checkbox" disabled>
<span data-i18n-content="stripMetadataTitle"></span>
</label>
<span class="badge badge-warning" data-i18n-content="advancedLabel"></span>
</div>
<div class="description-option" data-i18n-content="stripMetadataDescription"></div>
</section>
<section class="option">
<div class="title-option" data-i18n-content="domainWhitelistTitle"></div> <div class="title-option" data-i18n-content="whitelistedDomainsTitle"></div>
<input class="input-text" data-option="domainWhitelist" type="text"> <input class="input-text" data-option="whitelistedDomains" type="text">
<div class="description-option" data-i18n-content="domainWhitelistDescription"></div> <div class="description-option" data-i18n-content="whitelistedDomainsDescription"></div>
</section> </section>
......
pages/options/options.js
+ 77
− 18
View file @ 0f786092
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
'use strict'; 'use strict';
/**
* Options
*/
var options = {};
/** /**
* Constants * Constants
*/ */
...@@ -21,13 +27,21 @@ const WEB_PREFIX_VALUE = 'www.'; ...@@ -21,13 +27,21 @@ const WEB_PREFIX_VALUE = 'www.';
const WEB_PREFIX_LENGTH = WEB_PREFIX_VALUE.length; const WEB_PREFIX_LENGTH = WEB_PREFIX_VALUE.length;
const VALUE_SEPARATOR = ';'; const VALUE_SEPARATOR = ';';
/**
* Private Methods
*/
options._getOptionElement = function (optionKey) {
return document.querySelector('[data-option=' + optionKey + ']');
};
/** /**
* Initializations * Initializations
*/ */
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
let i18nElements, blockMissingElement, domainWhitelistElement; let i18nElements, optionElements;
i18nElements = document.querySelectorAll('[data-i18n-content]'); i18nElements = document.querySelectorAll('[data-i18n-content]');
...@@ -37,41 +51,86 @@ document.addEventListener('DOMContentLoaded', function () { ...@@ -37,41 +51,86 @@ document.addEventListener('DOMContentLoaded', function () {
i18nElement.innerText = chrome.i18n.getMessage(i18nMessageName); i18nElement.innerText = chrome.i18n.getMessage(i18nMessageName);
}); });
blockMissingElement = document.querySelector('[data-option=blockMissing]'); optionElements = {
domainWhitelistElement = document.querySelector('[data-option=domainWhitelist]'); 'showIconBadge': options._getOptionElement('showIconBadge'),
'blockMissing': options._getOptionElement('blockMissing'),
'disablePrefetch': options._getOptionElement('disablePrefetch'),
'stripMetadata': options._getOptionElement('stripMetadata'),
'whitelistedDomains': options._getOptionElement('whitelistedDomains')
};
chrome.storage.local.get(Object.keys(optionElements), function (items) {
chrome.storage.local.get(['blockMissing', 'whitelistedDomains'], function (items) { let whitelistedDomains, domainWhitelist;
let whitelistedDomains = items.whitelistedDomains || {}; whitelistedDomains = items.whitelistedDomains;
let domainWhitelist = ''; domainWhitelist = '';
Object.keys(whitelistedDomains).forEach(function (domain) { Object.keys(whitelistedDomains).forEach(function (domain) {
domainWhitelist = domainWhitelist + domain + ';'; domainWhitelist = domainWhitelist + domain + ';';
}); });
domainWhitelist = domainWhitelist.slice(0, -1); domainWhitelist = domainWhitelist.slice(0, -1);
domainWhitelist = domainWhitelist.replace(/^;+|;+$/g, '');
blockMissingElement.checked = items.blockMissing || false; optionElements.showIconBadge.checked = items.showIconBadge;
domainWhitelistElement.value = domainWhitelist || ''; optionElements.blockMissing.checked = items.blockMissing;
optionElements.disablePrefetch.checked = items.disablePrefetch;
optionElements.stripMetadata.checked = items.stripMetadata;
optionElements.whitelistedDomains.value = domainWhitelist;
}); });
let optionChangedHandler = function () { let optionChangedHandler = function ({target}) {
let whitelistedDomains = {}; let optionKey, optionType, optionValue;
domainWhitelistElement.value.split(VALUE_SEPARATOR).forEach(function (domain) { optionKey = target.getAttribute('data-option');
whitelistedDomains[_normalizeDomain(domain)] = true; optionType = target.getAttribute('type');
});
chrome.storage.local.set({ switch (optionType) {
case 'checkbox':
optionValue = target.checked;
break;
default:
optionValue = target.value;
}
if (optionKey === 'disablePrefetch') {
if (optionValue === false) {
// Restore default values of related preference values.
chrome.privacy.network.networkPredictionEnabled.clear({});
} else {
'blockMissing': blockMissingElement.checked, chrome.privacy.network.networkPredictionEnabled.set({
'whitelistedDomains': whitelistedDomains 'value': false
});
}
}
if (optionKey === 'whitelistedDomains') {
let domainWhitelist = optionValue;
optionValue = {};
domainWhitelist.split(VALUE_SEPARATOR).forEach(function (domain) {
optionValue[_normalizeDomain(domain)] = true;
});
}
chrome.storage.local.set({
[optionKey]: optionValue
}); });
}; };
blockMissingElement.addEventListener('change', optionChangedHandler); optionElements.showIconBadge.addEventListener('change', optionChangedHandler);
domainWhitelistElement.addEventListener('keyup', optionChangedHandler); optionElements.blockMissing.addEventListener('change', optionChangedHandler);
optionElements.disablePrefetch.addEventListener('change', optionChangedHandler);
optionElements.stripMetadata.addEventListener('change', optionChangedHandler);
optionElements.whitelistedDomains.addEventListener('keyup', optionChangedHandler);
}); });
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment