Merge branch 'staging' into newDrive

www/common/fsStore.js

@@ -300,7 +300,7 @@ define([
         .on('change', ['drive', 'migrate'], function () {
             var path = arguments[2];
             var value = arguments[1];
-            if (path[0] === 'drive' && path[1] === "migrate" && value == 1) {
+            if (path[0] === 'drive' && path[1] === "migrate" && value === 1) {
                 rt.network.disconnect();
                 rt.realtime.abort();
                 Cryptpad.alert(Cryptpad.Messages.fs_migration, null, true);

www/drive/main.js

@@ -1798,7 +1798,7 @@ define([
 
             module.resetTree();
 
-            if (displayedCategories.indexOf(SEARCH) !== -1) {
+            if (displayedCategories.indexOf(SEARCH) !== -1 && $tree.find('#searchInput').length) {
                 // in history mode we want to focus the version number input
                 if (!history.isHistoryMode && !APP.mobile()) {
                     var st = $tree.scrollTop() || 0;
@@ -2040,7 +2040,7 @@ define([
             var isOpened = filesOp.comparePath(path, currentPath);
             var $trashElement = createTreeElement(TRASH_NAME, $icon, [TRASH], false, true, false, isOpened);
             $trashElement.addClass('root');
-            $trashElement.contextmenu(openTrashTreeContextMenu);
+            $trashElement.find('>.element-row').contextmenu(openTrashTreeContextMenu);
             var $trashList = $('<ul>', { id: 'trashTree', 'class': 'category2' }).append($trashElement);
             $container.append($trashList);
         };