Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Michael Telatynski
Olm
Commits
ad173bc7
Commit
ad173bc7
authored
May 19, 2020
by
Hubert Chathi
Browse files
Merge branch 'matthew/js-fixes' into 'master'
Fix JS demos, which had bitrotted See merge request
!12
parents
5a9fdd85
ddd140b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
ad173bc7
...
...
@@ -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
...
...
javascript/README.md
View file @
ad173bc7
...
...
@@ -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:
...
...
javascript/demo/group_demo.js
View file @
ad173bc7
...
...
@@ -489,4 +489,8 @@ function startDemo() {
}
document
.
addEventListener
(
"
DOMContentLoaded
"
,
startDemo
,
false
);
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
()
{
Olm
.
init
().
then
(
function
()
{
startDemo
();
});
},
false
);
javascript/demo/one_to_one_demo.html
View file @
ad173bc7
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment