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

Remove unnecessary code

Browse Source
This commit is contained in:
yflory
2019-07-03 15:54:03 +02:00
parent b74e28fed3
commit eba32fe994
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/userObject.js
View File

@@ -519,15 +519,7 @@ define([
var resFolders = []; var resFolders = [];
var findFoldersRec = function (folder, path) { var findFoldersRec = function (folder, path) {
for (var key in folder) { for (var key in folder) {
if (isFolder(folder[key])) { if (isFolder(folder[key]) && !isSharedFolder(folder[key])) {
if (isSharedFolder(folder[key])) {
// var name = getSharedFolderData(folder[key]).title || "";
// if (name.toLowerCase().indexOf(lValue) !== -1) {
// resFolders.push(path.concat([key, ROOT]));
// }
findFoldersRec(folder[key], path.concat([key, ROOT]));
}
else {
if (key.toLowerCase().indexOf(lValue) !== -1) { if (key.toLowerCase().indexOf(lValue) !== -1) {
resFolders.push({ resFolders.push({
id: null, id: null,
@@ -540,7 +532,6 @@ define([
findFoldersRec(folder[key], path.concat(key)); findFoldersRec(folder[key], path.concat(key));
} }
} }
}
}; };
findFoldersRec(files[ROOT], [ROOT]); findFoldersRec(files[ROOT], [ROOT]);
resFolders = resFolders.sort(function (a, b) { resFolders = resFolders.sort(function (a, b) {

2
www/drive/inner.js
View File

@@ -2684,7 +2684,7 @@ define([
else { else {
$icon.append($folderIcon.clone()); $icon.append($folderIcon.clone());
$type.text(Messages.fm_folder); $type.text(Messages.fm_folder);
$('<a>').text(Messages.fm_openFolder || "Open folder").click(function (e) { $('<a>').text(Messages.fc_open).click(function (e) {
e.preventDefault(); e.preventDefault();
APP.displayDirectory(path); APP.displayDirectory(path);
}).appendTo($openDir); }).appendTo($openDir);