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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login

pull/1/head
ansuz 2016-12-22 17:20:30 +01:00
parent 5534da8abf 81259fc25f
commit 63cd5c16ac
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/fsStore.js
View File

@ -158,7 +158,7 @@ define([
if (!rt.proxy[Cryptpad.storageKey] || !Cryptpad.isArray(rt.proxy[Cryptpad.storageKey])) {
var oldStore = Cryptpad.getStore(true);
oldStore.get(Cryptpad.storageKey, function (err, s) {
rt.proxy.filesData = s;
rt.proxy[Cryptpad.storageKey] = s;
onReady(f, rt.proxy, Cryptpad.storageKey);
});
return;

8
www/file/main.js
View File

@ -1488,7 +1488,11 @@ define([
// Reload after a few ms to make sure all the change events have been received
onRefresh.refresh();
} else if (path.length && path[0] === FILES_DATA) {
refreshFilesData();
if (filesOp.isPathInHrefArray(currentPath)) {
onRefresh.refresh();
} else {
refreshFilesData();
}
}
module.resetTree();
return false;
@ -1547,7 +1551,7 @@ define([
var viewHash = APP.viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
APP.hash = readOnly ? viewHash : editHash;
if (!readOnly && (!window.location.hash || !localStorage.FS_hash)) {
if (!readOnly && !localStorage.FS_hash && !Cryptpad.getUserHash() && !window.location.hash) {
localStorage.FS_hash = editHash;
}