From 7a70d69d8eedee3aebb2f026738ddd1baf7dac23 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 7 Mar 2018 17:34:55 +0100
Subject: [PATCH] Hide editor toolbars by default when using a small screen

---
 www/common/common-ui-elements.js | 3 +++
 www/common/cursor.js             | 2 +-
 www/common/toolbar3.js           | 2 +-
 www/pad/inner.js                 | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4c6fd1295..15e3c7b8c 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -852,6 +852,7 @@ define([
         var tbState = true;
         common.getAttribute(['general', 'markdown-help'], function (e, data) {
             if (e) { return void console.error(e); }
+            if ($(window).height() < 800) { return; }
             if (data === true && $toolbarButton.length && tbState) {
                 $toolbarButton.click();
             }
@@ -868,6 +869,7 @@ define([
             }
             common.getAttribute(['general', 'markdown-help'], function (e, data) {
                 if (e) { return void console.error(e); }
+                if ($(window).height() < 800) { return; }
                 if (data === true && $toolbarButton) {
                     // Show the toolbar using the button to make sure the icon in the button is
                     // correct (caret-down / caret-up)
@@ -923,6 +925,7 @@ define([
         });
 
         common.getAttribute(['hideHelp', type], function (err, val) {
+            if ($(window).height() < 800) { return void toggleHelp(true); }
             if (val === true) { toggleHelp(true); }
         });
 
diff --git a/www/common/cursor.js b/www/common/cursor.js
index 845067a80..be4ad1e2c 100644
--- a/www/common/cursor.js
+++ b/www/common/cursor.js
@@ -116,7 +116,7 @@ define([
             } else {
                 var errText = "[cursor.fixSelection] At least one of the " +
                     "cursor nodes did not exist, could not fix selection";
-                console.error(errText);
+                //console.error(errText);
                 return errText;
             }
             } catch (e) { console.error(e); }
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index f8937d777..0c9d3c8f3 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,7 @@ define([
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false) { return void hide(); }
+            if (val === false || $(window).height() < 800) { return void hide(); }
             show();
         });
 
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 5d161142b..cf21d199c 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -282,7 +282,7 @@ define([
             framework._.sfCommon.setAttribute(['pad', 'showToolbar'], visible);
         };
         framework._.sfCommon.getAttribute(['pad', 'showToolbar'], function (err, data) {
-            if (typeof(data) === "undefined" || data) { $('.cke_toolbox_main').show(); }
+            if ($(window).height() >= 800 && (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); }
             else { $('.cke_toolbox_main').hide(); }
             var $collapse = framework._.sfCommon.createButton('toggle', true, cfg, onClick);
             framework._.toolbar.$rightside.append($collapse);