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

Fix openincode in anon shared folders

Browse Source
This commit is contained in:
yflory 2020-02-10 14:43:22 +01:00
parent 8afb0255c1
commit d0f8458dd2
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1175,13 +1175,9 @@ define([
} else if ($element.is('.cp-app-drive-element-noreadonly')) { } else if ($element.is('.cp-app-drive-element-noreadonly')) {
hide.push('openro'); // Remove open 'view' mode hide.push('openro'); // Remove open 'view' mode
} }
// if it's not a plain text file var metadata = manager.getFileData(manager.find(path));
// XXX: there is a bug with this code in anon shared folder, so we disable it if (!metadata || !Util.isPlainTextFile(metadata.fileType, metadata.title)) {
if (APP.loggedIn || !APP.newSharedFolder) { hide.push('openincode');
var metadata = manager.getFileData(manager.find(path));
if (!metadata || !Util.isPlainTextFile(metadata.fileType, metadata.title)) {
hide.push('openincode');
}
} }
} else if ($element.is('.cp-app-drive-element-sharedf')) { } else if ($element.is('.cp-app-drive-element-sharedf')) {
if (containsFolder) { if (containsFolder) {
@ -3237,21 +3233,23 @@ define([
var path = currentPath.slice(1); var path = currentPath.slice(1);
var root = Util.find(data, path); var root = Util.find(data, path);
var realPath = [ROOT, SHARED_FOLDER].concat(path);
if (manager.hasSubfolder(root)) { $list.append($folderHeader); } if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
// display sub directories // display sub directories
var keys = Object.keys(root); var keys = Object.keys(root);
var sortedFolders = sortElements(true, currentPath, keys, null, !getSortFolderDesc()); var sortedFolders = sortElements(true, realPath, keys, null, !getSortFolderDesc());
var sortedFiles = sortElements(false, currentPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc()); var sortedFiles = sortElements(false, realPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
sortedFolders.forEach(function (key) { sortedFolders.forEach(function (key) {
if (manager.isFile(root[key])) { return; } if (manager.isFile(root[key])) { return; }
var $element = createElement(currentPath, key, root, true); var $element = createElement(realPath, key, root, true);
$element.appendTo($list); $element.appendTo($list);
}); });
if (manager.hasFile(root)) { $list.append($fileHeader); } if (manager.hasFile(root)) { $list.append($fileHeader); }
// display files // display files
sortedFiles.forEach(function (key) { sortedFiles.forEach(function (key) {
if (manager.isFolder(root[key])) { return; } if (manager.isFolder(root[key])) { return; }
var $element = createElement(currentPath, key, root, false); var $element = createElement(realPath, key, root, false);
if (!$element) { return; } if (!$element) { return; }
$element.appendTo($list); $element.appendTo($list);
}); });
@ -3973,6 +3971,14 @@ define([
common.sessionStorage.put(Constants.newPadTeamKey, APP.team, waitFor()); common.sessionStorage.put(Constants.newPadTeamKey, APP.team, waitFor());
}).nThen(function () { }).nThen(function () {
common.openURL('/code/'); common.openURL('/code/');
// We need to restore sessionStorage for the next time we want to create a pad from this tab
// NOTE: the 100ms timeout is to fix a race condition in firefox where sessionStorage
// would be deleted before the new tab was created
setTimeout(function () {
common.sessionStorage.put(Constants.newPadFileData, '', function () {});
common.sessionStorage.put(Constants.newPadPathKey, '', function () {});
common.sessionStorage.put(Constants.newPadTeamKey, '', function () {});
}, 100);
}); });
} }

4
www/drive/inner.js
View File

@ -96,7 +96,11 @@ define([
var updateObject = function (sframeChan, obj, cb) { var updateObject = function (sframeChan, obj, cb) {
sframeChan.query('Q_DRIVE_GETOBJECT', null, function (err, newObj) { sframeChan.query('Q_DRIVE_GETOBJECT', null, function (err, newObj) {
copyObjectValue(obj, newObj); copyObjectValue(obj, newObj);
// If anon shared folder, make a virtual drive containing this folder
if (!APP.loggedIn && APP.newSharedFolder) { if (!APP.loggedIn && APP.newSharedFolder) {
obj.drive.root = {
sf: APP.newSharedFolder
};
obj.drive.sharedFolders = obj.drive.sharedFolders || {}; obj.drive.sharedFolders = obj.drive.sharedFolders || {};
obj.drive.sharedFolders[APP.newSharedFolder] = { obj.drive.sharedFolders[APP.newSharedFolder] = {
href: APP.anonSFHref, href: APP.anonSFHref,