Merge remote-tracking branch 'origin/master' into dbkr/pk_private_export_import

1 files changed, 10 insertions, 0 deletions

diff --git a/javascript/olm_pre.js b/javascript/olm_pre.js
index 4feff97..314d7da 100644
--- a/javascript/olm_pre.js
+++ b/javascript/olm_pre.js
@@ -37,3 +37,13 @@ if (typeof(OLM_OPTIONS) !== 'undefined') {
  * use UTF8ToString.
  */
 var NULL_BYTE_PADDING_LENGTH = 1;
+
+Module['onRuntimeInitialized'] = function() {
+    OLM_ERROR = Module['_olm_error']();
+    olm_exports["PRIVATE_KEY_LENGTH"] = Module['_olm_pk_private_key_length']();
+    if (onInitSuccess) onInitSuccess();
+};
+
+Module['onAbort'] = function(err) {
+    if (onInitFail) onInitFail(err);
+};