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

Fix share modal in anon drive

pull/1/head
yflory 2020-05-27 13:21:59 +02:00
parent c3d6b72763
commit 446a429d6b
1 changed files with 8 additions and 3 deletions
www/common

11
www/common/drive-ui.js
View File

@ -4215,8 +4215,9 @@ define([
el = manager.find(paths[0].path);
var parsed, modal;
var friends = common.getFriends();
var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;
if (manager.isFolder(el) && !manager.isSharedFolder(el)) { // Folder
if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
// if folder is inside SF
if (manager.isInSharedFolder(paths[0].path)) {
return void UI.alert(Messages.convertFolderToSF_SFParent);
@ -4254,8 +4255,12 @@ define([
});
}
} else { // File or shared folder
var sf = manager.isSharedFolder(el);
data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
var sf = !anonDrive && manager.isSharedFolder(el);
if (anonDrive) {
data = el;
} else {
data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
}
parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
var roParsed = Hash.parsePadUrl(data.roHref);
var padType = parsed.type || roParsed.type;