timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More fixes to the javascript bindings to get them to behave with browserify

Browse source
This commit is contained in:
Mark Haines 2015-07-20 16:33:45 +01:00
parent 970fc60f8b
commit f0bb8e03b3
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
javascript/olm_pre.js
View file

@ -1,14 +1,17 @@
var olm_exports = {}; var olm_exports = {};
var get_random_values; var get_random_values;
if (typeof(window) !== 'undefined') { var process; // Shadow the process object so that emscripten won't get
// We've been imported directly into a browser. // confused by browserify
window["Olm"] = olm_exports; if (global && global.window) {
// We're running with browserify
module["exports"] = olm_exports;
global.window["Olm"] = olm_exports;
get_random_values = function(buf) { get_random_values = function(buf) {
window.crypto.getRandomValues(buf); window.crypto.getRandomValues(buf);
}; };
} else if (global.window) { } else if (typeof(window) !== 'undefined') {
// We're running with browserify // We've been imported directly into a browser.
global.window["Olm"] = olm_exports; window["Olm"] = olm_exports;
get_random_values = function(buf) { get_random_values = function(buf) {
window.crypto.getRandomValues(buf); window.crypto.getRandomValues(buf);
}; };
@ -20,6 +23,7 @@ if (typeof(window) !== 'undefined') {
var bytes = nodeCrypto.randomBytes(buf.length); var bytes = nodeCrypto.randomBytes(buf.length);
buf.set(bytes); buf.set(bytes);
} }
process = global.process;
} else { } else {
throw new Error("Cannot find global to attach library to"); throw new Error("Cannot find global to attach library to");
} }