From 218c75817310c4d81643997eefababc336e91bbd Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 4 Jun 2016 23:55:59 -0700 Subject: [PATCH] Only use workaround for Chrome settings being async in Chrome extension. --- src/main/Main.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/Main.coffee b/src/main/Main.coffee index 000212ea0..957a4f54b 100644 --- a/src/main/Main.coffee +++ b/src/main/Main.coffee @@ -50,7 +50,7 @@ Main = Conf['Oekaki Links'] = true # Pseudo-enforce default whitelist while configuration loads - $.global -> + if $.platform is 'crx' then $.global -> {whitelist} = document.currentScript.dataset whitelist = whitelist.split('\n').filter (x) -> x[0] isnt "'" oldFun = {} @@ -72,11 +72,10 @@ Main = items[key] = undefined for key of Conf items['previousversion'] = undefined ($.getSync or $.get) items, (items) -> - # Enforce JS whitelist jsWhitelist = items['jsWhitelist'] ? Conf['jsWhitelist'] $.addCSP "script-src #{jsWhitelist.replace(/[\s;]+/g, ' ')}" - $.event 'csp-ready' + $.event 'csp-ready' if $.platform is 'crx' $.asap docSet, ->