diff options
author | tg(x) <*@tg-x.net> | 2016-02-22 23:15:43 +0100 |
---|---|---|
committer | tg(x) <*@tg-x.net> | 2016-02-22 23:15:43 +0100 |
commit | 4e0362878ea04c0701449b8453f1781271ab1c7b (patch) | |
tree | 6257108377d6467b69763eb017da23ba52ffa66e /extension/background/main.ts | |
parent | c4446d02d541b4c4ea2234170520874cf64c4bc7 (diff) | |
parent | 82742861d29a9d75da4de90322a128bcad5da503 (diff) |
Merge branch 'master' of taler.net:/var/git/wallet
Diffstat (limited to 'extension/background/main.ts')
-rw-r--r-- | extension/background/main.ts | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/extension/background/main.ts b/extension/background/main.ts index 4ec2c4d5d..746d81a60 100644 --- a/extension/background/main.ts +++ b/extension/background/main.ts @@ -26,22 +26,6 @@ System.config({ defaultJSExtensions: true, }); -// We expect that in the manifest, the emscripten js is loaded -// becore the background page. -// Currently it is not possible to use SystemJS to load the emscripten js. -declare var Module: any; -if ("object" !== typeof Module) { - throw Error("emscripten not loaded, no 'Module' defined"); -} - -// Manually register the emscripten js as a SystemJS, so that -// we can use it from TypeScript by importing it. -{ - let mod = System.newModule({Module: Module}); - let modName = System.normalizeSync("../lib/emscripten/emsc"); - console.log("registering", modName); - System.set(modName, mod); -} System.import("../lib/wallet/wxMessaging") .then((wxMessaging) => { |