diff --git a/src/main/Main.coffee b/src/main/Main.coffee index 351a00a8c..000212ea0 100644 --- a/src/main/Main.coffee +++ b/src/main/Main.coffee @@ -71,7 +71,7 @@ Main = items = {} items[key] = undefined for key of Conf items['previousversion'] = undefined - $.get items, (items) -> + ($.getSync or $.get) items, (items) -> # Enforce JS whitelist jsWhitelist = items['jsWhitelist'] ? Conf['jsWhitelist'] diff --git a/src/platform/$.coffee b/src/platform/$.coffee index d2f130701..e86cb7de4 100644 --- a/src/platform/$.coffee +++ b/src/platform/$.coffee @@ -570,11 +570,12 @@ $.get = (key, val, cb) -> else items = key cb = val - $.queueTask -> - for key of items - if val = $.getValue g.NAMESPACE + key - items[key] = JSON.parse val - cb items + $.queueTask $.getSync, items, cb + +$.getSync = (items, cb) -> + for key of items when (val2 = $.getValue g.NAMESPACE + key) + items[key] = JSON.parse val2 + cb items $.set = (keys, val, cb) -> if typeof keys is 'string'