From 3a151393c5f699bfb577d6aa6cfc96ec879ff5cc Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 7 Mar 2018 14:56:56 -0800 Subject: [PATCH] Move wrapDeferred from background.js to preload.js It's necessary anywhere that will have to deal with Deferreds. --- js/background.js | 6 ------ preload.js | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/js/background.js b/js/background.js index e4ad04066..0aeaecae6 100644 --- a/js/background.js +++ b/js/background.js @@ -22,12 +22,6 @@ console.log(e); }; - window.wrapDeferred = function(deferred) { - return new Promise(function(resolve, reject) { - deferred.then(resolve, reject); - }); - }; - console.log('background page reloaded'); console.log('environment:', window.config.environment); diff --git a/preload.js b/preload.js index 3a38b7e6c..80c33f611 100644 --- a/preload.js +++ b/preload.js @@ -6,6 +6,11 @@ window.PROTO_ROOT = 'protos'; window.config = require('url').parse(window.location.toString(), true).query; + window.wrapDeferred = function(deferred) { + return new Promise(function(resolve, reject) { + deferred.then(resolve, reject); + }); + }; const ipc = electron.ipcRenderer; window.config.localeMessages = ipc.sendSync('locale-data');