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

Refresh unsorted and templates when files data changes

Browse Source
This commit is contained in:
yflory
2016-12-22 17:20:05 +01:00
parent 9b6c9e3891
commit 81259fc25f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}