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

2017-06-09 16:26:36 +02:00
parent 47857ec382 75c3c10b20
commit 4bcad3e154
5 changed files with 14 additions and 3 deletions
--- 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;