Move the parseHash code into parsePadUrl

2017-05-12 16:33:45 +02:00
parent e0293a1162
commit 0f13198119
7 changed files with 125 additions and 61 deletions
--- a/www/common/common-history.js
+++ b/www/common/common-history.js
@@ -35,8 +35,8 @@ define([
        };
        var realtime = createRealtime();

-        var hash = config.href ? common.parsePadUrl(config.href).hash : undefined;
-        var secret = common.getSecrets(hash);
+        var parsed = config.href ? common.parsePadUrl(config.href) : {};
+        var secret = common.getSecrets(parsed.type, parsed.hash);
        var crypto = Crypto.createEncryptor(secret.keys);

        var to = window.setTimeout(function () {