jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from codedust/master 

Fixed 'TypeError: Promise.resolve is not a constructor' in Firefox
This commit is contained in:
Matt Corallo 2014-05-18 20:11:58 +00:00
parent 810aabf2a6 14ebef70cb
commit 0362ecf709
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/crypto.js
View File

@ -87,9 +87,9 @@ window.textsecure.crypto = new function() {
priv[0] |= 0x0001;
//TODO: fscking type conversion
return new Promise.resolve({ pubKey: prependVersion(toArrayBuffer(curve25519(priv))), privKey: privKey});
return Promise.resolve({ pubKey: prependVersion(toArrayBuffer(curve25519(priv))), privKey: privKey});
}
}
var privToPub = function(privKey, isIdentity) { return testing_only.privToPub(privKey, isIdentity); }

2
js/webcrypto.js
View File

@ -73,7 +73,7 @@ window.crypto.subtle = (function() {
function promise(implementation) {
var args = Array.prototype.slice.call(arguments);
args.shift();
return new Promise.resolve(toArrayBuffer(implementation.apply(this, args)));
return Promise.resolve(toArrayBuffer(implementation.apply(this, args)));
}
// public interface functions