From 5afc4f88ff5a2510e7cf6aab26bbb70a9d82637e Mon Sep 17 00:00:00 2001
From: Thomas Rientjes <synzvato@protonmail.com>
Date: Mon, 2 Jul 2018 02:00:04 +0200
Subject: [PATCH] Update and refactor existing codebase
---
core/interceptor.js | 1 +
core/mappings.js | 23 +++++++++++++++++++++++
core/state-manager.js | 2 +-
modules/internal/helpers.js | 4 +++-
pages/options/options.css | 3 +++
pages/popup/popup.js | 6 +-----
6 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/core/interceptor.js b/core/interceptor.js
index 6ca3506..c1d9c7a 100644
--- a/core/interceptor.js
+++ b/core/interceptor.js
@@ -55,6 +55,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
'blog.datawrapper.de': true,
'bundleofholding.com': true,
'cdnjs.com': true,
+ 'code.world': true,
'dropbox.com': true,
'evoice.com': true,
'freebusy.io': true,
diff --git a/core/mappings.js b/core/mappings.js
index 2f2a8b4..dab3def 100644
--- a/core/mappings.js
+++ b/core/mappings.js
@@ -184,6 +184,29 @@ var mappings = {
}
},
// Baidu CDN
+ 'apps.bdimg.com': {
+ '/libs/': {
+ 'angular.js/{version}/angular.': resources.angular,
+ 'backbone.js/{version}/backbone.': resources.backbone,
+ 'backbone.js/{version}/backbone-min.': resources.backbone,
+ 'dojo/{version}/dojo.': resources.dojo,
+ 'ember.js/{version}/ember.': resources.ember,
+ 'ext-core/{version}/ext-core.': resources.extCore,
+ 'jquery/{version}/jquery.': resources.jQuery,
+ 'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
+ 'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
+ 'mootools/{version}/mootools-yui-compressed.': resources.mootools,
+ 'prototype/{version}/prototype.': resources.prototypeJS,
+ 'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+ 'swfobject/{version}/swfobject.': resources.swfobject,
+ 'swfobject/{version}/swfobject_src.': resources.swfobject,
+ 'underscore.js/{version}/underscore.': resources.underscore,
+ 'underscore.js/{version}/underscore-min.': resources.underscore,
+ 'webfont/{version}/webfont.': resources.webfont,
+ 'webfont/{version}/webfont_debug.': resources.webfont
+ }
+ },
+ // Baidu CDN [Deprecated]
'libs.baidu.com': {
'/': {
'backbone/{version}/backbone.': resources.backbone,
diff --git a/core/state-manager.js b/core/state-manager.js
index 0620c34..85f7aa1 100644
--- a/core/state-manager.js
+++ b/core/state-manager.js
@@ -125,7 +125,7 @@ stateManager._updateTab = function (details) {
let tabDomain, domainIsWhitelisted, frameIdentifier, tabIdentifier;
- tabDomain = helpers.extractDomainFromUrl(details.url);
+ tabDomain = helpers.extractDomainFromUrl(details.url, true);
domainIsWhitelisted = stateManager._domainIsWhitelisted(tabDomain);
frameIdentifier = details.frameId;
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index 9bacc05..58ccdd2 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -160,8 +160,10 @@ helpers.determineCdnName = function (domainName) {
return 'Yandex CDN';
case 'yandex.st':
return 'Yandex CDN [Deprecated]';
- case 'libs.baidu.com':
+ case 'apps.bdimg.com':
return 'Baidu CDN';
+ case 'libs.baidu.com':
+ return 'Baidu CDN [Deprecated]';
case 'lib.sinaapp.com':
return 'Sina Public Resources';
case 'upcdn.b0.upaiyun.com':
diff --git a/pages/options/options.css b/pages/options/options.css
index ba2532a..bec5f7f 100644
--- a/pages/options/options.css
+++ b/pages/options/options.css
@@ -12,6 +12,8 @@ body {
}
.option {
+ display: flex;
+ flex-direction: column;
margin-top: 25px;
}
@@ -81,6 +83,7 @@ body {
.input-text {
margin-left: 29px;
+ max-width: 320px;
}
/**
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index 7dc635e..9adccba 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -171,11 +171,7 @@ popup._determineTargetTab = function () {
chrome.tabs.query({'active': true, 'currentWindow': true}, function (tabs) {
popup._targetTab = tabs[0];
- popup._domain = helpers.extractDomainFromUrl(tabs[0].url);
-
- if (popup._domain !== null) {
- popup._domain = helpers.normalizeDomain(popup._domain);
- }
+ popup._domain = helpers.extractDomainFromUrl(tabs[0].url, true);
resolve();
});
--
GitLab