infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager

pull/1/head
ansuz 2016-12-12 18:25:07 +01:00
parent f36d15d0db 8e6830d080
commit 5d335ba796
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/cryptpad-common.js
View File

@ -185,6 +185,7 @@ define([
secret.key = Crypto.createEditCryptor().editKeyStr;
} else {
var hash = secretHash || window.location.hash.slice(1);
console.log(hash);
if (hash.length === 0) {
secret.keys = Crypto.createEditCryptor();
secret.key = Crypto.createEditCryptor().editKeyStr;

2
www/file/main.js
View File

@ -19,7 +19,7 @@ define([
var $iframe = $('#pad-iframe').contents();
var ifrw = $('#pad-iframe')[0].contentWindow;
var hash = window.location.hash || localStorage.FS_hash;
var hash = window.location.hash.slice(1) || localStorage.FS_hash;
var secret = Cryptpad.getSecrets(hash);
var ROOT = "root";