Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

8 years ago · 4d9060f49e
parent 378bf2aa94 f5f8e148ca
commit 4d9060f49e
1 changed files with 3 additions and 1 deletions
--- a/www/drive/main.js
+++ b/www/drive/main.js
@ -1771,7 +1771,8 @@ define([
                    if (parentPath) {
                        $a = $('<a>').text(Messages.fm_openParent).click(function (e) {
                            e.preventDefault();
-                            parentPath.pop();
+                            if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
+                            else { parentPath.pop(); }
                            module.displayDirectory(parentPath);
                        });
                    }
@ -1823,6 +1824,7 @@ define([
                displayDirectory(parentPath, true);
                return;
            }
+            if (!isSearch) { delete APP.Search.oldLocation; }

            module.resetTree();