From 9d758a040baf0a0364cadd90bf9ac945ebf75fcb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Jun 2017 15:45:46 +0200
Subject: [PATCH 1/3] Fix an issue with the search field not displayed properly

---
 www/drive/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/drive/main.js b/www/drive/main.js
index ee241ffed..ce90cf999 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1838,7 +1838,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;

From c1402fbb0ab1aae203b1e74bb8ac98ea6a69f5aa Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Jun 2017 15:56:18 +0200
Subject: [PATCH 2/3] Lint error

---
 www/common/fsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/fsStore.js b/www/common/fsStore.js
index 67d87ed9c..35bd9a048 100644
--- a/www/common/fsStore.js
+++ b/www/common/fsStore.js
@@ -296,7 +296,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);

From 7134b005447a4b1db91cffef58bb804c0e3f9f93 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Jun 2017 17:02:50 +0200
Subject: [PATCH 3/3] Add a button to display the context menu for the trash on
 mobiles

---
 www/drive/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/drive/main.js b/www/drive/main.js
index ce90cf999..41bf090c2 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -2080,7 +2080,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);
         };