Merge branch 'matthew/js-fixes' into 'master'

Fix JS demos, which had bitrotted See merge request matrix-org/olm!12

Merge branch 'matthew/js-fixes' into 'master'
Fix JS demos, which had bitrotted See merge request matrix-org/olm!12
ad173bc7 · Hubert Chathi · 5a9fdd85 · ddd140b2 · ad173bc7 · ad173bc7
Commit ad173bc7 authored May 19, 2020 by Hubert Chathi
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ JS_ASMJS_TARGET := javascript/olm_legacy.js
 WASM_TARGET := $(BUILD_DIR)/wasm/libolm.a

 JS_EXPORTED_FUNCTIONS := javascript/exported_functions.json
-JS_EXTRA_EXPORTED_RUNTIME_METHODS := ALLOC_STACK
+JS_EXTRA_EXPORTED_RUNTIME_METHODS := [ALLOC_STACK]
 JS_EXTERNS := javascript/externs.js

 PUBLIC_HEADERS := include/olm/olm.h include/olm/outbound_group_session.h include/olm/inbound_group_session.h include/olm/pk.h include/olm/sas.h

--- a/javascript/README.md
+++ b/javascript/README.md
@@ -2,7 +2,8 @@ Olm
 ===

 Note: before using any of the olm functions, you must call `Olm.init()`, and
-wait for the promise to resolve.
+wait for the promise to resolve, otherwise you will get errors like:
+`Uncaught TypeError: Olm.Account is not a constructor`

 Example:


--- a/javascript/demo/group_demo.js
+++ b/javascript/demo/group_demo.js
@@ -489,4 +489,8 @@ function startDemo() {
 }


-document.addEventListener("DOMContentLoaded", startDemo, false);
+document.addEventListener("DOMContentLoaded", function() {
+    Olm.init().then(function() {
+        startDemo();
+    });
+}, false);
--- a/javascript/demo/one_to_one_demo.html
+++ b/javascript/demo/one_to_one_demo.html
@@ -2,7 +2,13 @@
 <head>
 <script src="../olm.js"></script>
 <script>
-document.addEventListener("DOMContentLoaded", function (event) {
+document.addEventListener("DOMContentLoaded", function() {
+    Olm.init().then(function() {
+        demo();
+    });
+}, false);
+
+function demo() {
    function progress(who, message) {
        var message_element = document.createElement("pre");
        var progress = document.getElementById(who + "_progress");
@@ -109,7 +115,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
        glue_encrypt("bob", "alice", b_session);
        glue_decrypt("alice", a_session);
    });
- }, false);
+}

 </script>
 <body>