aboutsummaryrefslogtreecommitdiff
path: root/javascript/olm_pre.js
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-10-10 20:08:55 +0100
committerDavid Baker <dave@matrix.org>2018-10-10 20:08:55 +0100
commit82534708a35640672c812e7603a84a9f42c8b50c (patch)
treef8e9a909d9bc075fb40b968fa4c478f42ebf9668 /javascript/olm_pre.js
parent2cbba061c3f0ce4d7f86c3dc2b7f7fd5f4f45ff7 (diff)
parent3cfcf1615dfe434e1aa10d5c904d537b159e1566 (diff)
Merge remote-tracking branch 'origin/master' into dbkr/ci2
Diffstat (limited to 'javascript/olm_pre.js')
-rw-r--r--javascript/olm_pre.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/javascript/olm_pre.js b/javascript/olm_pre.js
index 4feff97..18d836d 100644
--- a/javascript/olm_pre.js
+++ b/javascript/olm_pre.js
@@ -37,3 +37,12 @@ if (typeof(OLM_OPTIONS) !== 'undefined') {
* use UTF8ToString.
*/
var NULL_BYTE_PADDING_LENGTH = 1;
+
+Module['onRuntimeInitialized'] = function() {
+ OLM_ERROR = Module['_olm_error']();
+ if (onInitSuccess) onInitSuccess();
+};
+
+Module['onAbort'] = function(err) {
+ if (onInitFail) onInitFail(err);
+};