From 6611165bffdfb5b1096a755ca78488bfee8486c1 Mon Sep 17 00:00:00 2001 From: Lukas Lihotzki Date: Sat, 3 Oct 2020 03:46:15 +0200 Subject: [PATCH] do not pollute the global object --- javascript/olm_prefix.js | 1 + javascript/olm_suffix.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/javascript/olm_prefix.js b/javascript/olm_prefix.js index b33dfe9..ae2d9f9 100644 --- a/javascript/olm_prefix.js +++ b/javascript/olm_prefix.js @@ -1,3 +1,4 @@ +var Olm = (function() { var olm_exports = {}; var onInitSuccess; var onInitFail; diff --git a/javascript/olm_suffix.js b/javascript/olm_suffix.js index 3e2f664..d6f72b7 100644 --- a/javascript/olm_suffix.js +++ b/javascript/olm_suffix.js @@ -17,16 +17,20 @@ olm_exports['init'] = function(opts) { return olmInitPromise; }; +return olm_exports; + +})(); + if (typeof(window) !== 'undefined') { // We've been imported directly into a browser. Define the global 'Olm' object. // (we do this even if module.exports was defined, because it's useful to have // Olm in the global scope for browserified and webpacked apps.) - window["Olm"] = olm_exports; + window["Olm"] = Olm; } if (typeof module === 'object') { // Emscripten sets the module exports to be its module // with wrapped c functions. Clobber it with our higher // level wrapper class. - module.exports = olm_exports; + module.exports = Olm; }