matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Load Olm from the global rather than requiring it.

Browse Source 
This means that we can avoid confusing everybody in the world about how to
webpack js-sdk apps.
This commit is contained in:
Richard van der Hoff
2017-06-01 13:04:04 +01:00
parent 331859d383
commit 41864d46c3
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/client.js
View File

@@ -47,8 +47,7 @@ try {
var Crypto = require("./crypto");
CRYPTO_ENABLED = true;
} catch (e) {
console.error("olm load error", e);
// Olm not installed.
console.warn("Unable to load crypto module: crypto will be disabled: " + e);
}
/**