mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move wrapDeferred from background.js to preload.js

Browse source 
It's necessary anywhere that will have to deal with Deferreds.
This commit is contained in:
Scott Nonnenberg 2018-03-07 14:56:56 -08:00 • committed by Scott Nonnenberg
parent a824e2b42d
commit 3a151393c5
No known key found for this signature in database
GPG key ID: 5F82280C35134661
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/background.js
View file

@ -22,12 +22,6 @@
console.log(e); console.log(e);
}; };
window.wrapDeferred = function(deferred) {
return new Promise(function(resolve, reject) {
deferred.then(resolve, reject);
});
};
console.log('background page reloaded'); console.log('background page reloaded');
console.log('environment:', window.config.environment); console.log('environment:', window.config.environment);

5
preload.js
View file

@ -6,6 +6,11 @@
window.PROTO_ROOT = 'protos'; window.PROTO_ROOT = 'protos';
window.config = require('url').parse(window.location.toString(), true).query; 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; const ipc = electron.ipcRenderer;
window.config.localeMessages = ipc.sendSync('locale-data'); window.config.localeMessages = ipc.sendSync('locale-data');