From 7e8c13bb3b175af56ed02d69897991b1e72d7557 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 25 Sep 2022 17:10:38 +0300 Subject: Fix some error in runtime.onInstalled --- src/assets/javascripts/general.js | 11 +++++++---- src/assets/javascripts/services.js | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/assets/javascripts') diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js index 072ff3c1..720b5769 100644 --- a/src/assets/javascripts/general.js +++ b/src/assets/javascripts/general.js @@ -1,17 +1,20 @@ "use strict" window.browser = window.browser || window.chrome +let exceptions + function isException(url) { for (const item of exceptions.url) if (item == `${url.protocol}//${url.host}`) return true for (const item of exceptions.regex) if (new RegExp(item).test(url.href)) return true return false } -let exceptions - function init() { - browser.storage.local.get("exceptions", r => { - exceptions = r.exceptions + return new Promise(resolve => { + browser.storage.local.get("exceptions", r => { + exceptions = r.exceptions + resolve() + }) }) } diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index 64bed3bb..3aa93c53 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -76,8 +76,8 @@ function regexArray(service, url) { return false } -await getConfig() -await init() +getConfig() +init() browser.storage.onChanged.addListener(init) function redirect(url, type, initiator) { -- cgit 1.4.1