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

Fix tests by returning promises

Browse source
This commit is contained in:
Matt Corallo 2014-07-27 02:05:25 -04:00
parent 87b626d42a
commit 28779e0b35
2 changed files with 47 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/helpers.js
View file

@ -570,11 +570,11 @@ window.textsecure.nacl = function() {
var onLoadCallbacks = [];
var naclLoaded = 0;
self.registerOnLoadFunction = function(func) {
if (naclLoaded || !self.USE_NACL) {
func();
return;
}
onLoadCallbacks[onLoadCallbacks.length] = func;
return new Promise(function(resolve, reject) {
if (naclLoaded || !self.USE_NACL)
return resolve(func());
onLoadCallbacks[onLoadCallbacks.length] = [ func, resolve, reject ];
});
}
var naclMessageNextId = 0;
@ -582,8 +582,13 @@ window.textsecure.nacl = function() {
window.moduleDidLoad = function() {
common.hideModule();
naclLoaded = 1;
for (var i = 0; i < onLoadCallbacks.length; i++)
onLoadCallbacks[i]();
for (var i = 0; i < onLoadCallbacks.length; i++) {
try {
onLoadCallbacks[i][1](onLoadCallbacks[i][0]());
} catch (e) {
onLoadCallbacks[i][2](e);
}
}
onLoadCallbacks = [];
}