web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the user object in file manager if it exists

Browse Source
This commit is contained in:
yflory 2016-12-20 11:30:04 +01:00
parent 6778a7062d
commit c7e63f63fd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/fsStore.js
View File

@ -122,7 +122,7 @@ define([
var init = function (f, Cryptpad) { var init = function (f, Cryptpad) {
if (!Cryptpad) { return; } if (!Cryptpad) { return; }
var hash = localStorage.FS_hash; var hash = Cryptpad.getUserHash() || localStorage.FS_hash;
var secret = Cryptpad.getSecrets(hash); var secret = Cryptpad.getSecrets(hash);
var listmapConfig = { var listmapConfig = {
data: {}, data: {},
@ -136,7 +136,9 @@ define([
var rt = window.rt = Listmap.create(listmapConfig); var rt = window.rt = Listmap.create(listmapConfig);
rt.proxy.on('create', function (info) { rt.proxy.on('create', function (info) {
var realtime = info.realtime; var realtime = info.realtime;
localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys); if (!Cryptpad.getUserHash()) {
localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
}
window.patchText = TextPatcher.create({ window.patchText = TextPatcher.create({
realtime: realtime, realtime: realtime,
logging: true, logging: true,

2
www/file/main.js
View File

@ -1444,7 +1444,7 @@ define([
APP.homePageIframe = true; APP.homePageIframe = true;
} }
var hash = window.location.hash.slice(1) || localStorage.FS_hash; var hash = Cryptpad.getUserHash() || window.location.hash.slice(1) || localStorage.FS_hash;
var secret = Cryptpad.getSecrets(hash); var secret = Cryptpad.getSecrets(hash);
var readOnly = APP.readOnly = secret.keys && !secret.keys.editKeyStr; var readOnly = APP.readOnly = secret.keys && !secret.keys.editKeyStr;