filippodb/LocalCDN-Firefox-Chrome-Brave
1
0
Fork 0
mirror of https://codeberg.org/nobody/LocalCDN.git synced 2025-06-05 21:49:31 +02:00
Code Issues Projects Releases Wiki Activity

Some code improvements (#109)

Browse Source
This commit is contained in:
nobody
2020-09-25 16:37:02 +02:00
parent d8a0991085
commit 152c5ff9ca
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
pages/options/options.js
View File

@@ -53,7 +53,7 @@ options._renderContents = function () {
}; };
options._renderOptionsPanel = function () { options._renderOptionsPanel = function () {
let whitelistedDomains, domainWhitelist, elements, htmlFilterDomains, domainHtmlFilter, googleFontsDomains, domainAllowedGoogleFonts; let whitelistedDomains, domainWhitelist, elements, htmlFilterDomains, domainHtmlFilter, googleFontsDomains, domainAllowedGoogleFonts, url, bgColor, txtColor;
Object.assign(options._optionValues, { [Setting.INTERNAL_STATISTICS]: options._internalStatistics }); Object.assign(options._optionValues, { [Setting.INTERNAL_STATISTICS]: options._internalStatistics });
@@ -116,9 +116,20 @@ options._renderOptionsPanel = function () {
document.getElementById('icon-light').checked = true; document.getElementById('icon-light').checked = true;
} }
let url = chrome.runtime.getURL('icons/action/' + options._optionValues.selectedIcon.toLowerCase() + '/icon38-default.png'); url = chrome.runtime.getURL('icons/action/' + options._optionValues.selectedIcon.toLowerCase() + '/icon38-default.png');
document.getElementById('icon-badge-preview').src = url; document.getElementById('icon-badge-preview').src = url;
bgColor = options._optionValues.badgeColor || '#4A826C';
txtColor = options._optionValues.badgeTextColor || '#FFFFFF';
document.getElementById('counter-preview-badge').style.backgroundColor = bgColor;
document.getElementById('pre-badged-background-color').style.backgroundColor = bgColor;
document.getElementById('badged-background-color').value = bgColor;
document.getElementById('counter-preview-badge').style.color = txtColor;
document.getElementById('pre-badged-text-color').style.backgroundColor = txtColor;
document.getElementById('badged-text-color').value = txtColor;
document.getElementById('last-mapping-update').textContent += ' ' + lastMappingUpdate; document.getElementById('last-mapping-update').textContent += ' ' + lastMappingUpdate;
document.getElementById('negate-html-filter-list-warning').addEventListener('click', function () { options._onLinkClick(Links.CODEBERG_HTML_FILTER); }); document.getElementById('negate-html-filter-list-warning').addEventListener('click', function () { options._onLinkClick(Links.CODEBERG_HTML_FILTER); });
document.getElementById('link-welcome-page').addEventListener('click', function () { options._onLinkClick(Links.WELCOME); }); document.getElementById('link-welcome-page').addEventListener('click', function () { options._onLinkClick(Links.WELCOME); });
@@ -236,7 +247,9 @@ options._getOptionElements = function () {
[Setting.BLOCK_GOOGLE_FONTS]: options._getOptionElement(Setting.BLOCK_GOOGLE_FONTS), [Setting.BLOCK_GOOGLE_FONTS]: options._getOptionElement(Setting.BLOCK_GOOGLE_FONTS),
[Setting.SELECTED_ICON]: options._getOptionElement(Setting.SELECTED_ICON), [Setting.SELECTED_ICON]: options._getOptionElement(Setting.SELECTED_ICON),
[Setting.ALLOWED_DOMAINS_GOOGLE_FONTS]: options._getOptionElement(Setting.ALLOWED_DOMAINS_GOOGLE_FONTS), [Setting.ALLOWED_DOMAINS_GOOGLE_FONTS]: options._getOptionElement(Setting.ALLOWED_DOMAINS_GOOGLE_FONTS),
[Setting.STORAGE_TYPE]: options._getOptionElement(Setting.STORAGE_TYPE) [Setting.STORAGE_TYPE]: options._getOptionElement(Setting.STORAGE_TYPE),
[Setting.BADGE_COLOR]: options._getOptionElement(Setting.BADGE_COLOR),
[Setting.BADGE_TEXT_COLOR]: options._getOptionElement(Setting.BADGE_TEXT_COLOR)
}; };
return optionElements; return optionElements;
}; };
@@ -349,42 +362,28 @@ options._createList = function (type) {
}; };
options._colorPicker = function () { options._colorPicker = function () {
const badgeBackgroundColor = new CP(document.getElementById('badged-background-color'));
storageManager.type.get([Setting.BADGE_COLOR, Setting.BADGE_TEXT_COLOR], function (items) { badgeBackgroundColor.on('change', function(r, g, b) {
options._textColor = items.badgeTextColor || '#FFFFFF'; this.source.value = this.color(r, g, b);
options._backgroundColor = items.badgeColor || '#4A826C'; });
badgeBackgroundColor.on('drag', function(r, g, b) {
options._backgroundColor = this.color(r, g, b);
this.source.value = options._backgroundColor
wrappers.setBadgeBackgroundColor({color: options._backgroundColor});
document.getElementById('counter-preview-badge').style.backgroundColor = options._backgroundColor; document.getElementById('counter-preview-badge').style.backgroundColor = options._backgroundColor;
document.getElementById('counter-preview-badge').style.color = options._textColor;
document.getElementById('pre-badged-background-color').style.backgroundColor = options._backgroundColor; document.getElementById('pre-badged-background-color').style.backgroundColor = options._backgroundColor;
});
const badgeTextColor = new CP(document.getElementById('badged-text-color'));
badgeTextColor.on('change', function(r, g, b) {
this.source.value = this.color(r, g, b);
});
badgeTextColor.on('drag', function(r, g, b) {
options._textColor = this.color(r, g, b);
this.source.value = options._textColor
wrappers.setBadgeTextColor({color: options._textColor});
document.getElementById('counter-preview-badge').style.color = options._textColor;
document.getElementById('pre-badged-text-color').style.backgroundColor = options._textColor; document.getElementById('pre-badged-text-color').style.backgroundColor = options._textColor;
document.getElementById('badged-background-color').value = options._backgroundColor;
document.getElementById('badged-text-color').value = options._textColor;
let badgeBackgroundColor = new CP(document.getElementById('badged-background-color'));
badgeBackgroundColor.on('change', function(r, g, b) {
this.source.value = this.color(r, g, b);
});
badgeBackgroundColor.on('drag', function(r, g, b) {
options._backgroundColor = this.color(r, g, b);
this.source.value = options._backgroundColor
wrappers.setBadgeBackgroundColor({color: options._backgroundColor});
document.getElementById('counter-preview-badge').style.backgroundColor = options._backgroundColor;
document.getElementById('pre-badged-background-color').style.backgroundColor = options._backgroundColor;
});
let badgeTextColor = new CP(document.getElementById('badged-text-color'));
badgeTextColor.on('change', function(r, g, b) {
this.source.value = this.color(r, g, b);
});
badgeTextColor.on('drag', function(r, g, b) {
options._textColor = this.color(r, g, b);
this.source.value = options._textColor
wrappers.setBadgeTextColor({color: options._textColor});
document.getElementById('counter-preview-badge').style.color = options._textColor;
document.getElementById('pre-badged-text-color').style.backgroundColor = options._textColor;
});
}); });
}; };