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

Fix shared folders issues including disappearing folders

Browse Source
This commit is contained in:
yflory
2018-07-20 18:27:59 +02:00
parent 4325ed4dde
commit f2baaf5b5b
9 changed files with 177 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/drive/app-drive.less
View File

@@ -782,6 +782,7 @@
}
.cp-app-drive-toolbar-rightside {
float: right;
flex-shrink: 0;
& > * {
float: right;
}
@@ -842,6 +843,8 @@
white-space: nowrap;
display: flex;
flex-flow: row-reverse;
flex-shrink: 1;
min-width: 50px;
max-width: 100%;
text-align: left;
.cp-app-drive-path-element {

7
www/drive/inner.js
View File

@@ -2750,12 +2750,13 @@ define([
if (!manager.isFolder(root[key])) { return; }
var newPath = path.slice();
newPath.push(key);
var nextPath = newPath.slice();
var isSharedFolder = manager.isSharedFolder(root[key]);
var $icon, isCurrentFolder, subfolder;
if (isSharedFolder) {
var fId = root[key];
// Fix path
newPath.push(manager.user.userObject.ROOT);
nextPath.push(manager.user.userObject.ROOT);
isCurrentFolder = manager.comparePath(newPath, currentPath);
// Subfolders?
var newRoot = manager.folders[fId].proxy[manager.user.userObject.ROOT];
@@ -2779,7 +2780,7 @@ define([
$element.find('>.cp-app-drive-element-row')
.addClass('cp-app-drive-element-sharedf');
}
createTree($element, newPath);
createTree($element, nextPath);
});
};
@@ -2957,6 +2958,8 @@ define([
if (manager.isSharedFolder(el)) {
delete data.roHref;
data.noPassword = true;
data.noExpiration = true;
}
UIElements.getProperties(common, data, cb);