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

Fix an issue with the search bar redirecting to incorrect location

Browse Source
This commit is contained in:
yflory
2017-05-23 18:09:30 +02:00
parent b1b7da862b
commit 90f5713d4a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/drive/main.js
View File

@@ -1771,7 +1771,8 @@ define([
if (parentPath) { if (parentPath) {
$a = $('<a>').text(Messages.fm_openParent).click(function (e) { $a = $('<a>').text(Messages.fm_openParent).click(function (e) {
e.preventDefault(); e.preventDefault();
parentPath.pop(); if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
else { parentPath.pop(); }
module.displayDirectory(parentPath); module.displayDirectory(parentPath);
}); });
} }
@@ -1823,6 +1824,7 @@ define([
displayDirectory(parentPath, true); displayDirectory(parentPath, true);
return; return;
} }
if (!isSearch) { delete APP.Search.oldLocation; }
module.resetTree(); module.resetTree();