Refactor existing codebase

Synzvato · Jun 28, 2018 · 3a2b0ab · 3a2b0ab
1 parent 182ee17
commit 3a2b0ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/core/constants.js b/core/constants.js
@@ -21,6 +21,7 @@ const Address = {
     'ANY': '*://*/*',
     'ANY_PATH': '/*',
     'ANY_PROTOCOL': '*://',
+    'CHROME': 'chrome:',
     'CHROME_EXTENSION': 'chrome-extension:',
     'DECENTRALEYES': 'decentraleyes.org',
     'EXAMPLE': 'example.org',

diff --git a/core/state-manager.js b/core/state-manager.js
@@ -148,9 +148,6 @@ stateManager._updateTab = function (details) {
             'tabId': tabIdentifier,
             'title': 'Decentraleyes (–)'
         });
-
-    } else {
-        stateManager._setIconDefault(tabIdentifier);
     }
 
     if (stateManager.showIconBadge === true) {
@@ -213,14 +210,6 @@ stateManager._domainIsWhitelisted = function (domain) {
     return false;
 };
 
-stateManager._setIconDefault = function (tabIdentifier) {
-
-    wrappers.setIcon({
-        'path': stateManager.defaultIconPath,
-        'tabId': tabIdentifier
-    });
-};
-
 stateManager._setIconDisabled = function (tabIdentifier) {
 
     wrappers.setIcon({
@@ -236,16 +225,6 @@ stateManager._setIconDisabled = function (tabIdentifier) {
 stateManager.requests = {};
 stateManager.tabs = {};
 
-stateManager.defaultIconPath = {
-    '16': chrome.runtime.getURL('icons/action/icon16-default.png'),
-    '18': chrome.runtime.getURL('icons/action/icon18-default.png'),
-    '19': chrome.runtime.getURL('icons/action/icon19-default.png'),
-    '32': chrome.runtime.getURL('icons/action/icon32-default.png'),
-    '36': chrome.runtime.getURL('icons/action/icon36-default.png'),
-    '38': chrome.runtime.getURL('icons/action/icon38-default.png'),
-    '64': chrome.runtime.getURL('icons/action/icon64-default.png')
-};
-
 stateManager.disabledIconPath = {
     '16': chrome.runtime.getURL('icons/action/icon16-disabled.png'),
     '18': chrome.runtime.getURL('icons/action/icon18-disabled.png'),

diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
@@ -98,6 +98,10 @@ helpers.extractDomainFromUrl = function (url, normalize) {
         extractedDomain = null;
     }
 
+    if (url.startsWith(Address.CHROME)) {
+        extractedDomain = null;
+    }
+
     if (extractedDomain === '') {
         extractedDomain = null;
     }