filippodb
/
LocalCDN-Firefox-Chrome-Brave
mirror of https://codeberg.org/nobody/LocalCDN.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Just code style (JS)

This commit is contained in:
nobody 2021-02-17 07:01:08 +01:00
parent 25a8a0499c
commit db398fadec
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
26 changed files with 572 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.eslintignore Normal file
View File

@ -0,0 +1,5 @@
_locales
icons
modules/noto-sans/*
modules/color-picker/*
resources

196
.eslintrc Normal file
View File

@ -0,0 +1,196 @@
{
"env": {
"browser": true,
"es6": true,
"webextensions": true
},
"extends": [
"eslint:recommended"
],
"globals": {
"Address": true,
"Environment": true,
"Header": true,
"MessageResponse": true,
"Resource": true,
"Setting": true,
"SettingDefaults": true,
"WebRequest": true,
"WebRequestType": true,
"Allowlist": true,
"BrowserType": true,
"IconType": true,
"Regex": true,
"Links": true,
"CDNs": true,
"IgnoredHost": true,
"EncodingTypes": true,
"fileGuard": true,
"files": true,
"helpers": true,
"interceptor": true,
"mappings": true,
"requestAnalyzer": true,
"requestSanitizer": true,
"resources": true,
"shorthands": true,
"stateManager": true,
"wrappers": true,
"storageManager": true,
"manipulateDOM": true,
"stats": true,
"targets": true,
"ruleGenerator": true,
},
"overrides": {
"files": [
"core/constants.js",
"core/files.js",
"core/mappings.js",
"core/resources.js",
"core/shorthands.js"
],
"rules": {
"no-unused-vars": "off"
}
},
"rules": {
"array-bracket-newline": "error",
"array-bracket-spacing": "error",
"arrow-body-style": "error",
"arrow-parens": "error",
"arrow-spacing": "error",
"block-spacing": "error",
"brace-style": "error",
"camelcase": "error",
"comma-spacing": "error",
"comma-style": "error",
"computed-property-spacing": "error",
"consistent-this": "error",
"curly": ["error", "multi-line"],
"eol-last": "error",
"eqeqeq": "error",
"func-call-spacing": "error",
"function-paren-newline": "error",
"generator-star-spacing": "error",
"indent": [
"error",
4
],
"key-spacing": "error",
"keyword-spacing": "error",
"linebreak-style": [
"error",
"unix"
],
"new-cap": "error",
"new-parens": "error",
"no-array-constructor": "error",
"no-bitwise": "error",
"no-confusing-arrow": "error",
"no-continue": "error",
"no-console": ["error", { allow: ["warn", "error", "log"] }],
"no-duplicate-imports": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-implicit-coercion": "error",
"no-implied-eval": "error",
"no-invalid-this": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-loop-func": "error",
"no-multi-spaces": "error",
"no-multi-str": "error",
"no-multiple-empty-lines": [
"error", {
"max": 2,
"maxEOF": 1,
"maxBOF": 0
}
],
"max-len": [
"error", {
"code": 120,
"ignoreUrls": true,
"ignoreStrings": true,
}
],
"one-var": [2, {
"var": "never",
"let": "always",
"const": "never"
}],
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-proto": "error",
"no-return-assign": "error",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow-restricted-names": "error",
"no-tabs": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "error",
"no-undef-init": "error",
"no-unmodified-loop-condition": "error",
"no-unused-expressions": "error",
"no-use-before-define": "error",
"no-useless-call": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-rename": "error",
"no-useless-return": "error",
"no-void": "error",
"no-warning-comments": "warn",
"no-whitespace-before-property": "error",
"no-with": "error",
"object-curly-spacing": "error",
"object-shorthand": [
"error",
"consistent-as-needed"
],
"operator-assignment": "error",
"operator-linebreak": "error",
"prefer-numeric-literals": "error",
"prefer-promise-reject-errors": "error",
"quote-props": "error",
"prefer-rest-params": "error",
"prefer-spread": "error",
"prefer-template": "error",
"quotes": [
"error",
"single"
],
"rest-spread-spacing": "error",
"require-await": "error",
"semi": "error",
"semi-spacing": "error",
"semi-style": "error",
"space-before-blocks": "error",
"space-before-function-paren": "error",
"space-in-parens": "error",
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": "error",
"strict": [
"error",
"global"
],
"switch-colon-spacing": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"template-tag-spacing": "error",
"unicode-bom": "error",
"vars-on-top": "error",
"wrap-regex": "error",
"yield-star-spacing": "error",
"yoda": "error",
}
}

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
test/**

5
core/constants.js
View File

@ -21,7 +21,6 @@
/**
* Constants
*/
const Address = {
'ANY': '*://*/*',
'ANY_PATH': '/*',
@ -126,8 +125,8 @@ const Allowlist = {
};
const BrowserType = {
'CHROMIUM': chrome.runtime.getURL("/").startsWith("chrome-extension"),
'FIREFOX': chrome.runtime.getURL("/").startsWith("moz-extension")
'CHROMIUM': chrome.runtime.getURL('/').startsWith('chrome-extension'),
'FIREFOX': chrome.runtime.getURL('/').startsWith('moz-extension')
};
const IconType = {

3
core/file-guard.js
View File

@ -16,12 +16,14 @@
'use strict';
/**
* File Guard
*/
var fileGuard = {};
/**
* Private Methods
*/
@ -47,6 +49,7 @@ fileGuard._verifyRequest = function (requestDetails) {
}
};
/**
* Initializations
*/

5
core/interceptor.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Interceptor
*/
var interceptor = {};
/**
* Public Methods
*/
@ -69,6 +71,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
};
};
/**
* Private Methods
*/
@ -122,6 +125,7 @@ interceptor._handleStorageChanged = function (changes) {
}
};
/**
* Initializations
*/
@ -146,6 +150,7 @@ storageManager.type.get(interceptor.relatedSettings, function (items) {
interceptor.allowedDomainsGoogleFonts = items.allowedDomainsGoogleFonts || {};
});
/**
* Event Handlers
*/

9
core/main.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Main
*/
var main = {};
/**
* Private Methods
*/
@ -107,19 +109,20 @@ main._showReleaseNotes = function (details) {
storageManager.type.set(items);
}
if ( (mappingUpdate && items.updateNotification == 1) || items.updateNotification == 2 ) {
if ((mappingUpdate && items.updateNotification === 1) || items.updateNotification === 2) {
chrome.tabs.create({
'url': chrome.extension.getURL('pages/updates/updates.html?mappingupdate=' + mappingUpdate),
'url': chrome.extension.getURL(`pages/updates/updates.html?mappingupdate=${mappingUpdate}`),
'active': false
});
} else {
// No mappings.js update
return;
}
});
}
};
/**
* Initializations
*/

46
core/manipulate-dom.js
View File

@ -35,10 +35,10 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
return;
}
let initiatorDomain, listedToManipulateDOM, negateHtmlFilter, filtering;
let initiatorDomain, listedToManipulateDOM, negateHtmlFilter, filtering, header;
initiatorDomain = helpers.extractDomainFromUrl(details.url, true) || Address.EXAMPLE;
listedToManipulateDOM = stateManager._domainIsListed(initiatorDomain, "manipulate-dom");
listedToManipulateDOM = stateManager._domainIsListed(initiatorDomain, 'manipulate-dom');
negateHtmlFilter = stateManager.getInvertOption;
if ((negateHtmlFilter || listedToManipulateDOM) && !(negateHtmlFilter && listedToManipulateDOM)) {
@ -48,7 +48,7 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
}
// by Jaap (https://gitlab.com/Jaaap)
let header = details.responseHeaders.find(h => h.name.toLowerCase() === 'content-type');
header = details.responseHeaders.find((h) => h.name.toLowerCase() === 'content-type');
if (header && filtering) {
@ -59,13 +59,13 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
if (!isAllowlisted && mimeType === 'text/html') {
let asciiDecoder, decoder, encoder, charset, isFirstData, filter;
let asciiDecoder, decoder, encoder, charset, isFirstData, filter, data;
charset = /charset\s*=/.test(header.value) && header.value.replace(/^.*?charset\s*=\s*/, '').replace(/["']?/g, '');
charset = (/charset\s*=/).test(header.value) && header.value.replace(/^.*?charset\s*=\s*/, '').replace(/["']?/g, '');
// Check if charset is supported by TextDecoder()
if (/charset\s*=/.test(header.value) && !EncodingTypes[charset.toString().toLowerCase()]) {
console.error('[ LocalCDN ] Unsupported charset: ' + charset);
console.error(`[ LocalCDN ] Unsupported charset: ${charset}`);
return;
}
@ -73,35 +73,40 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
encoder = new TextEncoder();
isFirstData = true;
filter = browser.webRequest.filterResponseData(details.requestId);
let data = [];
data = [];
header.value = 'text/html; charset=UTF-8';
// Note that should work if the '<script crossorigin="anonymous" src="dfgsfgd.com">' string is divided into two chunks.
filter.ondata = evt => {
// NOTE: should work if 'script' string is divided into two chunks
filter.ondata = (evt) => {
if (isFirstData) {
if (!charset) {
// content-type has no charset declared
let htmlHead = asciiDecoder.decode(evt.data, {stream: false});
let charsetMatch = htmlHead.match(/<meta.*charset=["']?([^>"'\/]+)["'].*[>\/]/i);
charset = charsetMatch ? charsetMatch[1] : "UTF-8";
let htmlHead, charsetMatch;
htmlHead = asciiDecoder.decode(evt.data, {'stream': false});
// eslint-disable-next-line no-useless-escape
charsetMatch = htmlHead.match(/<meta.*charset=["']?([^>"'\/]+)["'].*[>\/]/i);
charset = charsetMatch ? charsetMatch[1] : 'UTF-8';
}
decoder = new TextDecoder(charset);
}
isFirstData = false;
data.push(evt.data);
}
};
filter.onstop = evt => {
filter.onstop = () => {
let str = '';
for (let buffer of data) {
str += decoder.decode(buffer, {stream: true});
str += decoder.decode(buffer, {'stream': true});
}
str += decoder.decode(); // end-of-stream
// remove crossorigin and integrity attributes
str = str.replace(/<(link|script)[^>]+>/ig, m => {
str = str.replace(/<(link|script)[^>]+>/ig, (m) => {
// eslint-disable-next-line no-use-before-define
if (cdnDomainsRE.test(m)) {
return m.replace(/\s+(integrity|crossorigin)(="[^"]*"|='[^']*'|=[^"'`=>\s]+|)/ig, '');
}
@ -109,9 +114,9 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
});
filter.write(encoder.encode(str));
filter.close();
};
}
}
return {responseHeaders: details.responseHeaders};
return {'responseHeaders': details.responseHeaders};
}
};
@ -121,8 +126,9 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
* Initializations
*/
let allowlistedDomains = {};
let cdnDomainsRE = new RegExp('//(' + Object.keys(mappings.cdn).map(m => m.replace(/\W/g, '\\$&')).join('|') + ')/');
/* eslint-disable one-var */
let cdnDomainsRE = new RegExp(`//(${Object.keys(mappings.cdn).map((m) => m.replace(/\W/g, '\\$&')).join('|')})/`);
/* eslint-enable one-var */
/**

3
core/mappings.js
View File

@ -18,6 +18,7 @@
'use strict';
/**
* Mappings
*/
@ -990,7 +991,7 @@ mappings.cdn['fonts.loli.net'] = mappings.cdn['fonts.googleapis.com'];
// Qihoo 360 CDN [Mirror]
mappings.cdn['lib.baomitu.com'] = {
'/': mappings.cdn['cdnjs.cloudflare.com']['/ajax/libs/']
}
};
// Boot CDN New [Mirror]
mappings.cdn['cdn.bootcdn.net'] = mappings.cdn['cdnjs.cloudflare.com'];

3
core/messenger.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Messenger
*/
var messenger = {};
/**
* Private Methods
*/
@ -97,6 +99,7 @@ messenger._handleMessageReceived = function (message, sender, sendResponse) {
}
};
/**
* Event Handlers
*/

27
core/request-analyzer.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Request Analyzer
*/
var requestAnalyzer = {};
/**
* Public Methods
*/
@ -64,9 +66,10 @@ requestAnalyzer.isValidCandidate = function (requestDetails, tabDetails) {
};
requestAnalyzer.getLocalTarget = function (requestDetails) {
let destinationUrl, destinationHost, destinationPath, hostMappings, basePath, resourceMappings;
let destinationSearchString = '';
let destinationUrl, destinationHost, destinationPath, hostMappings, basePath,
resourceMappings, destinationSearchString;
destinationSearchString = '';
destinationUrl = new URL(requestDetails.url);
destinationHost = destinationUrl.host;
@ -91,9 +94,11 @@ requestAnalyzer.getLocalTarget = function (requestDetails) {
}
// Return either the local target's path or false.
// eslint-disable-next-line max-len
return requestAnalyzer._findLocalTarget(resourceMappings, basePath, destinationHost, destinationPath, destinationSearchString);
};
/**
* Private Methods
*/
@ -108,6 +113,7 @@ requestAnalyzer._matchBasePath = function (hostMappings, channelPath) {
return false;
};
// eslint-disable-next-line max-len
requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channelHost, channelPath, destinationSearchString) {
let resourcePath, versionNumber, resourcePattern, filename, shorthandResource;
@ -119,7 +125,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
if (Resource.SINGLE_NUMBER_EXPRESSION.test(channelPath)) {
versionNumber = channelPath.match(/\d/);
resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER);
versionNumber = [versionNumber + '.0'];
versionNumber = [`${versionNumber}.0`];
} else {
versionNumber = resourcePath.match(Resource.VERSION_EXPRESSION);
resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER);
@ -128,14 +134,14 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
shorthandResource = shorthands.specialFiles(channelHost, channelPath, destinationSearchString);
if (shorthandResource) {
if (requestAnalyzer.logging) {
console.log('[ LocalCDN ] Replaced resource: ' + shorthandResource.path);
console.log(`[ LocalCDN ] Replaced resource: ${shorthandResource.path}`);
}
return shorthandResource;
}
for (let resourceMold of Object.keys(resourceMappings)) {
if (resourcePattern.startsWith(resourceMold)) {
let targetPath, versionDelivered, versionRequested;
let targetPath, versionDelivered, versionRequested, bundle;
targetPath = resourceMappings[resourceMold].path;
targetPath = targetPath.replace(Resource.VERSION_PLACEHOLDER, versionNumber);
@ -154,15 +160,15 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
}
// Get bundle name
let bundle = targets.determineBundle(targetPath);
bundle = targets.determineBundle(targetPath);
if (bundle !== '') {
filename = channelPath.split('/').pop();
targetPath = ( filename.endsWith('.js') ) ? targetPath + filename + 'm' : targetPath + filename;
targetPath = (filename.endsWith('.js')) ? `${targetPath + filename}m` : targetPath + filename;
targetPath = helpers.formatFilename(targetPath);
}
if (requestAnalyzer.logging) {
console.log('[ LocalCDN ] Replaced resource: ' + targetPath);
console.log(`[ LocalCDN ] Replaced resource: ${targetPath}`);
}
// Prepare and return a local target.
return {
@ -176,7 +182,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
}
if (requestAnalyzer.logging && !IgnoredHost[channelHost]) {
console.warn('[ LocalCDN ] Missing resource: ' + channelHost + channelPath);
console.warn(`[ LocalCDN ] Missing resource: ${channelHost}${channelPath}`);
}
return false;
};
@ -197,6 +203,7 @@ requestAnalyzer._applyAllowedDomainsGoogleFonts = function () {
});
};
/**
* Initializations
*/
@ -209,6 +216,8 @@ requestAnalyzer._applyManipulateDOMDomains();
requestAnalyzer.domainsGoogleFonts = {};
requestAnalyzer._applyAllowedDomainsGoogleFonts();
/**
* Event Handlers
*/

4
core/request-sanitizer.js
View File

@ -13,12 +13,14 @@
'use strict';
/**
* Request Sanitizer
*/
var requestSanitizer = {};
/**
* Public Methods
*/
@ -41,6 +43,7 @@ requestSanitizer.disable = function () {
}, [WebRequest.BLOCKING, WebRequest.HEADERS]);
};
/**
* Private Methods
*/
@ -69,6 +72,7 @@ requestSanitizer._stripMetadata = function (requestDetails) {
};
};
/**
* Initializations
*/

1
core/resources.js
View File

@ -18,6 +18,7 @@
'use strict';
/**
* Resources
*/

36
core/shorthands.js
View File

@ -18,6 +18,7 @@
'use strict';
/**
* Shorthands
*/
@ -25,14 +26,17 @@
var shorthands = {};
shorthands.specialFiles = function (channelHost, channelPath, searchString) {
let lastVersion;
/*
NOTE:
jsDelivr allows to load several files in one request
This is just a workaround. If there are more websites which use this, we will have to do crazy things here to find and redirect these files.
It's not possible to respond to a request with multiple redirections
https://gitlab.com/nobody42/localcdn/-/issues/45
let lastVersion;
/**
* NOTE:
* jsDelivr allows to load several files in one request
* This is just a workaround. If there are more websites which use this,
* we will have to do crazy things here to find and redirect these files.
*
* It's not possible to respond to a request with multiple redirections
* https://gitlab.com/nobody42/localcdn/-/issues/45
*/
if (Regex.JSDELIVR_COMBINE.test(channelHost + channelPath)) {
@ -63,7 +67,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
return {
'source': channelHost,
'versionDelivered': lastVersion,
'path': 'resources/bootstrap-datepicker/' + lastVersion + '/bootstrap-datepicker3.standalone.min.css',
'path': `resources/bootstrap-datepicker/${lastVersion}/bootstrap-datepicker3.standalone.min.css`,
'bundle': ''
};
} else if (Regex.BOOTSTRAP_DATEPICKER.test(channelPath)) {
@ -71,7 +75,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
return {
'source': channelHost,
'versionDelivered': lastVersion,
'path': 'resources/bootstrap-datepicker/' + lastVersion + '/bootstrap-datepicker.standalone.min.css',
'path': `resources/bootstrap-datepicker/${lastVersion}/bootstrap-datepicker.standalone.min.css`,
'bundle': ''
};
} else if (Regex.FONT_AWESOME.test(channelHost + channelPath)) {
@ -90,7 +94,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'source': channelHost,
'versionRequested': '4.6.3',
'versionDelivered': lastVersion,
'path': 'resources/webfont/fa-loader.' + fileExtension,
'path': `resources/webfont/fa-loader.${fileExtension}`,
'bundle': ''
};
} else if ((channelHost + channelPath) === 'cdn.jsdelivr.net/npm/vue') {
@ -99,7 +103,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'source': channelHost,
'versionRequested': 'latest',
'versionDelivered': lastVersion,
'path': 'resources/vue/' + lastVersion + '/vue.min.jsm',
'path': `resources/vue/${lastVersion}/vue.min.jsm`,
'bundle': ''
};
} else if ((channelHost + channelPath) === 'ajax.cloudflare.com/cdn-cgi/scripts/7089c43e/cloudflare-static/rocket-loader.min.js') {
@ -115,7 +119,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'source': channelHost,
'versionRequested': '4.1.1',
'versionDelivered': lastVersion,
'path': 'resources/object-assign/' + lastVersion + '/object-assign.min.jsm',
'path': `resources/object-assign/${lastVersion}/object-assign.min.jsm`,
'bundle': ''
};
} else if ((channelHost + channelPath) === 'netdna.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css') {
@ -124,7 +128,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
return {
'source': channelHost,
'versionRequested': lastVersion,
'path': 'resources/font-awesome/' + lastVersion + '/css/font-awesome.min.css',
'path': `resources/font-awesome/${lastVersion}/css/font-awesome.min.css`,
'bundle': ''
};
} else if ((channelHost + channelPath) === 'cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.0.0-beta.2.4/owl.carousel.min.js') {
@ -144,7 +148,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'source': channelHost,
'versionDelivered': lastVersion,
'versionRequested': '4.1.0-beta.1',
'path': 'resources/select2/' + lastVersion + '/' + helpers.extractFilenameFromPath(channelPath),
'path': `resources/select2/${lastVersion}/${helpers.extractFilenameFromPath(channelPath)}`,
'bundle': 'Select2'
};
} else if (channelHost + channelPath === 'cdn.jsdelivr.net/npm/anchor-js/anchor.min.js') {
@ -154,13 +158,13 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'source': channelHost,
'versionDelivered': lastVersion,
'versionRequested': lastVersion,
'path': 'resources/anchor-js/' + lastVersion + '/anchor.min.jsm',
'path': `resources/anchor-js/${lastVersion}/anchor.min.jsm`,
'bundle': ''
};
} else if (Regex.BOOTSTRAP_FONTS_ONLY.test(channelPath)) {
return {
'source': channelHost,
'path': 'resources/twitter-bootstrap/fonts/' + helpers.extractFilenameFromPath(channelPath),
'path': `resources/twitter-bootstrap/fonts/${helpers.extractFilenameFromPath(channelPath)}`,
'bundle': 'Bootstrap (Fonts)'
};
} else if (channelHost + channelPath === 'cdn.jsdelivr.net/npm/js-cookie@beta/dist/js.cookie.min.js') {

4
core/state-manager.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* State Manager
*/
var stateManager = {};
/**
* Public Methods
*/
@ -251,7 +253,7 @@ stateManager._domainIsListed = function (domain, listname) {
let allowlistRecord, isAllowlisted;
if (listname === "manipulate-dom") {
if (listname === 'manipulate-dom') {
allowlistRecord = requestAnalyzer.domainsManipulateDOM[domain];
isAllowlisted = Boolean(allowlistRecord);
} else {

56
core/storage-manager.js
View File

@ -14,12 +14,21 @@
'use strict';
/**
* Constants
*/
const InvalidFile = 'Invalid file!';
/**
* Storage Manager
*/
var storageManager = {};
/**
* Public Methods
*/
@ -78,12 +87,12 @@ storageManager.migrateData = function (target) {
storageManager.export = function () {
let filename = new Date().toISOString();
filename = filename.substring(0, 10) + '_localcdn_backup.txt';
filename = `${filename.substring(0, 10)}_localcdn_backup.txt`;
storageManager.type.get(null, function (items) {
delete items['whitelistedDomains'];
let element = document.createElement('a');
element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(items, null, ' ')));
element.setAttribute('href', `data:text/plain;charset=utf-8,${encodeURIComponent(JSON.stringify(items, null, ' '))}`);
element.setAttribute('download', filename);
element.style.display = 'none';
document.body.appendChild(element);
@ -169,13 +178,13 @@ storageManager._validation = function (content) {
// Set default if not existing in file
imported[key] = value;
} else {
alert(chrome.i18n.getMessage('dialogImportFailed') + '\n\n' + key + ': ' + content[key]);
throw 'Invalid file!';
alert(`${chrome.i18n.getMessage('dialogImportFailed')}\n\n${key}: ${content[key]}`);
throw InvalidFile;
}
}
// set values directly
wrappers.setIcon({ path: imported['selectedIcon'] }, 'Enabled');
wrappers.setIcon({'path': imported['selectedIcon']}, 'Enabled');
storageManager.amountInjected = imported['amountInjected'];
storageManager.statistics = imported['internalStatisticsData'];
@ -187,13 +196,15 @@ storageManager._validation = function (content) {
storageManager._validateDomainsAndStatistics = function (type, obj) {
let valid = {};
if (type === 'allowedDomainsGoogleFonts' || type === 'domainsManipulateDOM' || type === 'allowlistedDomains') {
for (const [key, value] of Object.entries(obj)) {
// eslint-disable-next-line no-useless-escape
if ((/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}/.test(key) || key === '') && value === true) {
valid[key] = value;
} else {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + key);
throw 'Invalid file!';
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${key}`);
throw InvalidFile;
}
}
} else if (type === 'internalStatisticsData') {
@ -202,32 +213,34 @@ storageManager._validateDomainsAndStatistics = function (type, obj) {
for (const [types, category] of Object.entries(values)) {
if (types === 'frameworks') {
for (const [name, counter] of Object.entries(category)) {
if (!/resources\/[0-9a-z.-]+\/((?:\d{1,2}\.){1,3}\d{1,2})?.*\.(css|jsm)/.test(name) && !storageManager._validateNumbers(counter)) {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + name);
throw 'Invalid file!';
// eslint-disable-next-line max-len
if (!(/resources\/[0-9a-z.-]+\/((?:\d{1,2}\.){1,3}\d{1,2})?.*\.(css|jsm)/).test(name) && !storageManager._validateNumbers(counter)) {
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${name}`);
throw InvalidFile;
}
}
} else if (types === 'cdns') {
for (const [name, counter] of Object.entries(category)) {
if (!/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}/.test(name) && !storageManager._validateNumbers(counter)) {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + name);
throw 'Invalid file!';
// eslint-disable-next-line no-useless-escape, max-len
if (!(/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}/).test(name) && !storageManager._validateNumbers(counter)) {
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${name}`);
throw InvalidFile;
}
}
} else {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + type);
throw 'Invalid file!';
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${type}`);
throw InvalidFile;
}
}
} else {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + date);
throw 'Invalid file!';
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${date}`);
throw InvalidFile;
}
}
valid = obj;
} else {
alert(chrome.i18n.getMessage('dialogImportFailed') + ': ' + type);
throw 'Invalid file!';
alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${type}`);
throw InvalidFile;
}
return valid;
};
@ -252,6 +265,11 @@ storageManager._validateNumbers = function (value) {
return isNaN(value) ? 0 : value;
};
/**
* Initializations
*/
storageManager.data = {};
storageManager.type = chrome.storage.local;
storageManager.amountInjected = 0;

14
modules/internal/helpers.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Helpers
*/
var helpers = {};
/**
* Public Methods
*/
@ -121,7 +123,7 @@ helpers.extractDomainFromUrl = function (url, normalize) {
};
helpers.getWildcard = function (initiatorDomain) {
let domain = initiatorDomain.split(".");
let domain = initiatorDomain.split('.');
if (domain.length > 2) {
domain[0] = '*';
@ -213,8 +215,12 @@ helpers.compareVersion = function (v1, v2) {
for (let i = 0; i < k; ++i) {
v1[i] = parseInt(v1[i], 10);
v2[i] = parseInt(v2[i], 10);
if (v1[i] > v2[i]) return true;
if (v1[i] < v2[i]) return false;
if (v1[i] > v2[i]) {
return true;
}
return v1.length == v2.length ? true : v1.length < v2.length ? false : true;
if (v1[i] < v2[i]) {
return false;
}
}
return v1.length === v2.length ? true : v1.length < v2.length ? false : true;
};

13
modules/internal/rule-generator.js
View File

@ -14,15 +14,18 @@
'use strict';
/**
* Updates
*/
var ruleGenerator = {};
/**
* Public Methods
*/
ruleGenerator.openRuleSet = function ({target}) {
let urls, key, textArea, btnCopy, content;
@ -35,14 +38,14 @@ ruleGenerator.openRuleSet = function ({ target }) {
textArea.style.display = 'block';
btnCopy.style.display = 'block';
for (var domain in urls) {
for (const domain in urls) {
if (key === 'uMatrix') {
content += '* ' + domain + ' script allow' + '\n';
content += '* ' + domain + ' css allow' + '\n';
content += `* ${domain} script allow\n`;
content += `* ${domain} css allow\n`;
} else if (key === 'uBlock') {
content += '* ' + domain + ' * noop' + '\n';
content += `* ${domain} * noop\n`;
} else if (key === 'AdGuard') {
content += '@@||' + domain + '^\n';
content += `@@||${domain}^\n`;
}
}
textArea.value = content.replace(/\n+$/, '');

11
modules/internal/stats.js
View File

@ -15,11 +15,18 @@
'use strict';
/**
* Stats
*/
var stats = {};
/**
* Public Methods
*/
stats.setStats = function (injection) {
let data, today, cdn, framework, newEntry, pathSegments;
@ -29,7 +36,7 @@ stats.setStats = function (injection) {
if (injection.bundle !== '') {
pathSegments = injection.path.split('/');
framework = pathSegments[0] + '/' + pathSegments[1] + '/' + pathSegments[2] + '/';
framework = `${pathSegments[0]}/${pathSegments[1]}/${pathSegments[2]}/`;
} else {
framework = injection.path;
}
@ -46,7 +53,7 @@ stats.setStats = function (injection) {
Object.assign(data[today]['frameworks'], {[framework]: 1});
}
} else {
newEntry = { frameworks: { [framework]: 1 }, cdns: { [cdn]: 1 } };
newEntry = {'frameworks': {[framework]: 1}, 'cdns': {[cdn]: 1}};
data[today] = newEntry;
}

5
modules/internal/targets.js
View File

@ -14,12 +14,14 @@
'use strict';
/**
* Targets
*/
var targets = {};
/**
* Public Methods
*/
@ -49,7 +51,7 @@ targets.determineBundle = function (path) {
val = 'Bootstrap (Fonts)';
}
return val === '' ? val : val + ' (Bundle)';
return val === '' ? val : `${val} (Bundle)`;
};
targets.setLastVersion = function (type, version) {
@ -499,6 +501,7 @@ targets.setLastVersion = function (type, version) {
};
targets.determineResourceName = function (filename) {
// eslint-disable-next-line no-use-before-define
return ListOfFiles[filename] || 'Unknown';
};

6
modules/internal/wrappers.js
View File

@ -17,12 +17,14 @@
'use strict';
/**
* Wrappers
*/
var wrappers = {};
/**
* Public Methods
*/
@ -64,6 +66,6 @@ storageManager.type.get([Setting.BADGE_COLOR, Setting.BADGE_TEXT_COLOR], functio
wrappers.textColor = items.badgeTextColor || '#FFFFFF';
wrappers.backgroundColor = items.badgeColor || '#4A826C';
wrappers.setBadgeTextColor({color: wrappers.textColor});
wrappers.setBadgeBackgroundColor({color: wrappers.backgroundColor});
wrappers.setBadgeTextColor({'color': wrappers.textColor});
wrappers.setBadgeBackgroundColor({'color': wrappers.backgroundColor});
});

11
pages/help/help.js
View File

@ -14,12 +14,18 @@
'use strict';
/**
* Help
*/
var help = {};
/**
* Private Methods
*/
help._onDocumentLoaded = function () {
let language = navigator.language;
@ -29,4 +35,9 @@ help._onDocumentLoaded = function () {
helpers.insertI18nContentIntoDocument(document);
};
/**
* Initializations
*/
document.addEventListener('DOMContentLoaded', help._onDocumentLoaded);

90
pages/options/options.js
View File

@ -18,12 +18,14 @@
'use strict';
/**
* Options
*/
var options = {};
/**
* Private Methods
*/
@ -55,7 +57,8 @@ options._renderContents = function () {
};
options._renderOptionsPanel = function () {
let allowlistedDomains, domainAllowlist, elements, htmlFilterDomains, domainHtmlFilter, googleFontsDomains, domainAllowedGoogleFonts, url, bgColor, txtColor;
let allowlistedDomains, domainAllowlist, elements, htmlFilterDomains, domainHtmlFilter,
googleFontsDomains, domainAllowedGoogleFonts, url, bgColor, txtColor;
Object.assign(options._optionValues, {[Setting.INTERNAL_STATISTICS]: options._internalStatistics});
@ -111,14 +114,16 @@ options._renderOptionsPanel = function () {
}
if (options._platformSupportIcons) {
if (options._optionValues.selectedIcon === 'Default') {
let selectedIcon = options._optionValues.selectedIcon;
if (selectedIcon === 'Default') {
document.getElementById('icon-default').checked = true;
} else if (options._optionValues.selectedIcon === 'Grey') {
} else if (selectedIcon === 'Grey') {
document.getElementById('icon-grey').checked = true;
} else if (options._optionValues.selectedIcon === 'Light') {
} else if (selectedIcon === 'Light') {
document.getElementById('icon-light').checked = true;
}
url = chrome.runtime.getURL('icons/action/' + options._optionValues.selectedIcon.toLowerCase() + '/icon38-default.png');
url = chrome.runtime.getURL(`icons/action/${selectedIcon.toLowerCase()}/icon38-default.png`);
document.getElementById('icon-badge-preview').src = url;
bgColor = options._optionValues.badgeColor || '#4A826C';
@ -133,15 +138,31 @@ options._renderOptionsPanel = function () {
document.getElementById('badged-text-color').value = txtColor;
}
document.getElementById('last-mapping-update').textContent += ' ' + mappings.lastMappingUpdate;
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-changelog').addEventListener('click', function () { options._onLinkClick(Links.CHANGELOG); });
document.getElementById('link-donate').addEventListener('click', function () { options._onLinkClick(Links.DONATE); });
document.getElementById('link-faq').addEventListener('click', function () { options._onLinkClick(Links.FAQ);});
document.getElementById('ruleset-help').addEventListener('click', function () { options._onLinkClick(Links.CODEBERG_RULESET); });
document.getElementById('sync-help').addEventListener('click', function () { options._onLinkClick(Links.FAQ + '#sync'); });
document.getElementById('link-statistic').addEventListener('click', function () { options._onLinkClick(Links.STATISTICS); });
document.getElementById('last-mapping-update').textContent += ` ${mappings.lastMappingUpdate}`;
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-changelog').addEventListener('click', function () {
options._onLinkClick(Links.CHANGELOG);
});
document.getElementById('link-donate').addEventListener('click', function () {
options._onLinkClick(Links.DONATE);
});
document.getElementById('link-faq').addEventListener('click', function () {
options._onLinkClick(Links.FAQ);
});
document.getElementById('ruleset-help').addEventListener('click', function () {
options._onLinkClick(Links.CODEBERG_RULESET);
});
document.getElementById('sync-help').addEventListener('click', function () {
options._onLinkClick(`${Links.FAQ}#sync`);
});
document.getElementById('link-statistic').addEventListener('click', function () {
options._onLinkClick(Links.STATISTICS);
});
document.getElementById('btn-general-tab').addEventListener('click', options._changeTab);
document.getElementById('btn-advanced-tab').addEventListener('click', options._changeTab);
@ -265,13 +286,15 @@ options._configureLinkPrefetching = function (value) {
chrome.privacy.network.networkPredictionEnabled.clear({});
} else {
chrome.privacy.network.networkPredictionEnabled.set({
value: false,
'value': false,
});
}
};
options._serializeAllowlistedDomains = function (allowlistedDomains) {
if (allowlistedDomains === undefined) return '';
if (allowlistedDomains === undefined) {
return '';
}
let domainAllowlist, allowlistedDomainKeys;
@ -361,20 +384,21 @@ options._createList = function (type) {
list.forEach((elem) => {
if (!(BrowserType.CHROMIUM && (elem === 'fontawesome' || elem === 'google-material-design-icons'))) {
textArea.value += elem + '\n';
textArea.value += `${elem}\n`;
}
});
};
options._colorPicker = function () {
/* eslint-disable no-undef, no-invalid-this */
const 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});
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;
});
@ -385,29 +409,31 @@ options._colorPicker = function () {
});
badgeTextColor.on('drag', function (r, g, b) {
options._textColor = this.color(r, g, b);
this.source.value = options._textColor
wrappers.setBadgeTextColor({color: options._textColor});
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;
});
/* eslint-enable no-undef, no-invalid-this */
};
options._setDefaultColor = function ({target}) {
if (target.id === 'restore-text-color') {
options._textColor = '#FFFFFF';
wrappers.setBadgeTextColor({color: 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('badged-text-color').value = options._textColor;
} else if (target.id === 'restore-background-color') {
options._backgroundColor = '#4A826C';
wrappers.setBadgeBackgroundColor({color: 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;
document.getElementById('badged-background-color').value = options._backgroundColor;
}
};
/**
* Event Handlers
*/
@ -451,7 +477,10 @@ options._onOptionChanged = function ({ target }) {
options._configureLinkPrefetching(optionValue);
}
if (optionKey === Setting.ALLOWLISTED_DOMAINS || optionKey === Setting.DOMAINS_MANIPULATE_DOM || optionKey === Setting.ALLOWED_DOMAINS_GOOGLE_FONTS) {
if (optionKey === Setting.ALLOWLISTED_DOMAINS ||
optionKey === Setting.DOMAINS_MANIPULATE_DOM ||
optionKey === Setting.ALLOWED_DOMAINS_GOOGLE_FONTS) {
optionValue = options._parseDomainAllowlist(optionValue);
}
@ -474,8 +503,8 @@ options._onOptionChanged = function ({ target }) {
}
if (optionKey === Setting.SELECTED_ICON) {
wrappers.setIcon({ path: optionValue }, 'Enabled');
let url = chrome.runtime.getURL('icons/action/' + optionValue.toLowerCase() + '/icon38-default.png');
wrappers.setIcon({'path': optionValue}, 'Enabled');
let url = chrome.runtime.getURL(`icons/action/${optionValue.toLowerCase()}/icon38-default.png`);
document.getElementById('icon-badge-preview').src = url;
}
storageManager.type.set({
@ -496,8 +525,8 @@ options._onStorageOptionChanged = function ({ target }) {
options._onLinkClick = function (url) {
chrome.tabs.create({
url: url,
active: true
'url': url,
'active': true
});
};
@ -524,12 +553,12 @@ options._onChangedHexColor = function ({ target }) {
target.classList.remove('color-error');
if (target.id === 'badged-text-color') {
options._textColor = target.value;
wrappers.setBadgeTextColor({color: 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;
} else {
options._backgroundColor = target.value;
wrappers.setBadgeBackgroundColor({color: 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;
}
@ -556,6 +585,7 @@ options._updatesDomainLists = function (changes) {
}
};
/**
* Initializations
*/

76
pages/popup/popup.js
View File

@ -18,14 +18,18 @@
'use strict';
/**
* Popup
*/
var popup = {};
/**
* Private Methods
*/
popup._renderContents = function () {
helpers.insertI18nContentIntoDocument(document);
helpers.insertI18nTitlesIntoDocument(document);
@ -49,7 +53,8 @@ popup._renderContents = function () {
};
popup._renderNonContextualContents = function () {
let versionLabelElement, nameLabelElement, counterElement, testingUtilityLinkElement, optionsButtonElement, donationButtonElement, infoButtonLabel;
let versionLabelElement, nameLabelElement, counterElement, testingUtilityLinkElement,
optionsButtonElement, donationButtonElement, infoButtonLabel;
versionLabelElement = document.getElementById('version-label');
nameLabelElement = document.getElementById('name-label');
@ -86,7 +91,8 @@ popup._renderContextualContents = function () {
};
popup._renderDomainAllowlistPanel = function () {
let websiteContextElement, protectionToggleElement, domainIndicatorElement, manipulateDOMToggleElement, manipulateDOMToggleStyle;
let websiteContextElement, protectionToggleElement, domainIndicatorElement,
manipulateDOMToggleElement, manipulateDOMToggleStyle;
websiteContextElement = document.getElementById('website-context');
protectionToggleElement = document.getElementById('protection-toggle-switch');
@ -139,8 +145,8 @@ popup._renderInjectionPanel = function (groupedInjections) {
popup._enableProtection = function () {
let message = {
topic: 'allowlist:remove-domain',
value: popup._domain,
'topic': 'allowlist:remove-domain',
'value': popup._domain,
};
chrome.runtime.sendMessage(message, function () {
@ -150,8 +156,8 @@ popup._enableProtection = function () {
popup._disableProtection = function () {
let message = {
topic: 'allowlist:add-domain',
value: popup._domain,
'topic': 'allowlist:add-domain',
'value': popup._domain,
};
chrome.runtime.sendMessage(message, function () {
@ -161,8 +167,8 @@ popup._disableProtection = function () {
popup._enableManipulateDOM = function () {
let message = {
topic: 'manipulateDOM:add-domain',
value: popup._domain,
'topic': 'manipulateDOM:add-domain',
'value': popup._domain,
};
chrome.runtime.sendMessage(message, function () {
@ -172,8 +178,8 @@ popup._enableManipulateDOM = function () {
popup._disableManipulateDOM = function () {
let message = {
topic: 'manipulateDOM:remove-domain',
value: popup._domain,
'topic': 'manipulateDOM:remove-domain',
'value': popup._domain,
};
chrome.runtime.sendMessage(message, function () {
@ -184,8 +190,8 @@ popup._disableManipulateDOM = function () {
popup._determineDomainAllowlistStatus = function () {
return new Promise((resolve) => {
let message = {
topic: 'domain:fetch-is-allowlisted',
value: popup._domain,
'topic': 'domain:fetch-is-allowlisted',
'value': popup._domain,
};
if (popup._domain === null) {
@ -202,8 +208,8 @@ popup._determineDomainAllowlistStatus = function () {
popup._determineStatusManipulateDOM = function () {
return new Promise((resolve) => {
let message = {
topic: 'domain:fetch-is-manipulateDOM',
value: popup._domain,
'topic': 'domain:fetch-is-manipulateDOM',
'value': popup._domain,
};
chrome.runtime.sendMessage(message, function (response) {
@ -216,8 +222,8 @@ popup._determineStatusManipulateDOM = function () {
popup._determineResourceInjections = function () {
return new Promise((resolve) => {
let message = {
topic: 'tab:fetch-injections',
value: popup._targetTab.id,
'topic': 'tab:fetch-injections',
'value': popup._targetTab.id,
};
chrome.runtime.sendMessage(message, function (response) {
@ -231,7 +237,7 @@ popup._determineResourceInjections = function () {
popup._determineTargetTab = function () {
return new Promise((resolve) => {
chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
chrome.tabs.query({'active': true, 'currentWindow': true}, function (tabs) {
popup._targetTab = tabs[0];
popup._domain = helpers.extractDomainFromUrl(tabs[0].url, true);
@ -320,14 +326,14 @@ popup._createInjectionGroupHeaderElement = function (source, cdn) {
};
popup._createInjectionGroupElement = function (source, cdn) {
let injectionGroupElement;
let injectionGroupElement, bundle, filtered;
// Filter duplicates
let bundle = [];
bundle = [];
for (let injection of cdn) {
bundle.push(injection);
}
let filtered = popup._filterDuplicates(bundle, 'bundle');
filtered = popup._filterDuplicates(bundle, 'bundle');
injectionGroupElement = document.createElement('ul');
injectionGroupElement.setAttribute('class', 'sublist');
@ -352,7 +358,7 @@ popup._createInjectionElement = function (injection) {
if (injection.bundle === '') {
name = targets.determineResourceName(filename);
} else {
name = injection.bundle + ' (Bundle)';
name = `${injection.bundle} (Bundle)`;
}
nameTextNode = document.createTextNode(`- ${name}`);
@ -393,7 +399,9 @@ popup._filterDuplicates = function (array, key) {
*/
let filtered = array
.map((e) => e[key])
.map((value, index, newArray) => (value != '' ? newArray.indexOf(value) === index && index : index))
.map(function (value, index, newArray) {
return value !== '' ? newArray.indexOf(value) === index && index : index;
})
.filter((e) => array[e])
.map((e) => array[e]);
@ -414,10 +422,10 @@ popup._renderLocaleNotice = function () {
};
/**
* Event Handlers
*/
popup._onDocumentLoaded = function () {
let manifest, language;
@ -436,8 +444,8 @@ popup._onDocumentLoaded = function () {
popup._onTestingUtilityLinkClicked = function (event) {
if (event.button === 0 || event.button === 1) {
chrome.tabs.create({
url: Links.LOCALCDN_TEST_WEBSITE + popup._targetTab.url,
active: event.button === 0,
'url': Links.LOCALCDN_TEST_WEBSITE + popup._targetTab.url,
'active': event.button === 0,
});
}
@ -454,8 +462,8 @@ popup._onOptionsButtonClicked = function () {
popup._onDonationButtonClicked = function () {
if (event.button === 0 || event.button === 1) {
chrome.tabs.create({
url: Links.DONATE,
active: event.button === 0,
'url': Links.DONATE,
'active': event.button === 0,
});
}
@ -488,8 +496,8 @@ popup._close = function () {
popup._onInfoButtonClicked = function () {
if (event.button === 0 || event.button === 1) {
chrome.tabs.create({
url: Links.FAQ_HTML_FILTER,
active: event.button === 0,
'url': Links.FAQ_HTML_FILTER,
'active': event.button === 0,
});
}
@ -501,8 +509,8 @@ popup._onInfoButtonClicked = function () {
popup._onIncompleteTranslation = function () {
if (event.button === 0 || event.button === 1) {
chrome.tabs.create({
url: Links.Weblate,
active: event.button === 0,
'url': Links.Weblate,
'active': event.button === 0,
});
}
@ -514,8 +522,8 @@ popup._onIncompleteTranslation = function () {
popup._onStatisticsButtonClicked = function () {
if (event.button === 0 || event.button === 1) {
chrome.tabs.create({
url: Links.STATISTICS,
active: event.button === 0,
'url': Links.STATISTICS,
'active': event.button === 0,
});
}
if (event.button === 0) {
@ -523,9 +531,11 @@ popup._onStatisticsButtonClicked = function () {
}
};
/**
* Initializations
*/
popup.negateHtmlFilterList = false;
popup._statisticsStatus = false;

24
pages/statistics/statistics.js
View File

@ -14,14 +14,18 @@
'use strict';
/**
* Statistic
*/
var statistics = {};
/**
* Private Methods
*/
statistics._onDocumentLoaded = function () {
helpers.insertI18nContentIntoDocument(document);
helpers.insertI18nTitlesIntoDocument(document);
@ -63,7 +67,7 @@ statistics._generateTable = function (data, type) {
valueColumn.appendChild(document.createTextNode(value[1]));
row.appendChild(valueColumn);
document.getElementById('tbody-' + type).appendChild(row);
document.getElementById(`tbody-${type}`).appendChild(row);
}
};
@ -92,7 +96,7 @@ statistics._mergeObjects = function (obj, arr) {
let bundle = targets.determineBundle(key);
if (bundle !== '') {
bundle = key.split('/');
key = bundle[0] + '/' + bundle[1] + '/' + bundle[2] + '/';
key = `${bundle[0]}/${bundle[1]}/${bundle[2]}/`;
}
// If CDN/Framework exists, add it, otherwise create new one
if (arr[key]) {
@ -125,9 +129,11 @@ statistics._setDateRange = function () {
if (days > 1) {
for (let i = 0; i < days; i++) {
let diff, day;
// NOTE: setDate/getDate is buggy over day/month/year boundaries
let diff = 24 * 3600000 * i;
let day = from.setTime(today.getTime() - diff);
diff = 24 * 3600000 * i;
day = from.setTime(today.getTime() - diff);
statistics._dateRange.push(new Date(day).toISOString().slice(0, 10));
}
}
@ -194,12 +200,12 @@ statistics._displayNameOfFramework = function (str, type) {
if (filename === 'Unknown') {
filename = targets.determineBundle(str);
if (filename === '' && str.startsWith('resources/font-awesome/')) {
filename = 'Font Awesome (Fonts)'
filename = 'Font Awesome (Fonts)';
}
}
version = str.match(Resource.VERSION_EXPRESSION);
if (version !== null && version.length > 0) {
version = version[0] === 'latest' ? version[0] : 'v' + version[0];
version = version[0] === 'latest' ? version[0] : `v${version[0]}`;
} else {
version = '';
}
@ -231,20 +237,22 @@ statistics._deleteStatistic = function () {
chrome.storage.local.set({
[Setting.INTERNAL_STATISTICS_DATA]: {}
});
chrome.runtime.sendMessage({ topic: 'deleteStatistic' });
chrome.runtime.sendMessage({'topic': 'deleteStatistic'});
}
};
statistics._registerListener = function () {
document.getElementById('date-range').addEventListener('change', statistics._handlerDateRange);
document.getElementById('btn-delete').addEventListener('click', function () {
statistics._handlerDateRange({ target: { value: 'delete' } });
statistics._handlerDateRange({'target': {'value': 'delete'}});
});
};
/**
* Initializations
*/
statistics._data = {};
statistics._dataSortedCDNs = {};
statistics._dataSortedFrameworks = {};

14
pages/updates/updates.js
View File

@ -15,19 +15,23 @@
'use strict';
/**
* Updates
*/
var updates = {};
/**
* Private Methods
*/
updates._openHistoryReleaseNotes = function () {
let container = document.getElementById('history-release-notes');
let toggle = document.getElementById('history-indicator');
let container, toggle;
container = document.getElementById('history-release-notes');
toggle = document.getElementById('history-indicator');
if (container.style.display === 'none') {
container.style.display = 'block';
@ -39,11 +43,13 @@ updates._openHistoryReleaseNotes = function () {
};
updates._onDocumentLoaded = function () {
let updateElements, urlParams;
document.getElementById('generate-ublock-rules').checked = false;
document.getElementById('generate-umatrix-rules').checked = false;
document.getElementById('generate-adguard-rules').checked = false;
let updateElements = {
updateElements = {
['ruleSets']: document.getElementsByName('rule-sets'),
['copyRuleSet']: document.getElementById('button-copy-rule-set'),
};
@ -57,7 +63,7 @@ updates._onDocumentLoaded = function () {
document.getElementById('history').addEventListener('click', updates._openHistoryReleaseNotes);
// GET parameter to display the rule set generator
let urlParams = new URLSearchParams(window.location.search);
urlParams = new URLSearchParams(window.location.search);
if (urlParams.get('mappingupdate') === 'true') {
document.getElementById('generator-section').style.display = 'block';
}