loleaflet/src/control/Control.UIManager.js | 2 +- loleaflet/src/layer/tile/TileLayer.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 72c49927c677652d66028975f419ea1874f344c4 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Fri Jul 3 12:25:50 2020 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Fri Jul 3 14:47:28 2020 +0200 notebookbar: avoid showing on mobile Change-Id: I3ad25cd65b41c7c94d866da86bfb9673a9bb2fc7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97831 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> diff --git a/loleaflet/src/control/Control.UIManager.js b/loleaflet/src/control/Control.UIManager.js index bf08bfa87..4a6bb927b 100644 --- a/loleaflet/src/control/Control.UIManager.js +++ b/loleaflet/src/control/Control.UIManager.js @@ -211,7 +211,7 @@ L.Control.UIManager = L.Control.extend({ } var enableNotebookbar = window.userInterfaceMode === 'notebookbar'; - if (enableNotebookbar) { + if (enableNotebookbar && !window.mode.isMobile()) { if (e.perm === 'edit') { this.makeSpaceForNotebookbar(this.map._docLayer._docType); } else if (e.perm === 'readonly' && $('#mobile-edit-button').is(':hidden')) { diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index f666ce519..0fe28e7ea 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -999,6 +999,8 @@ L.TileLayer = L.GridLayer.extend({ _onJSDialogMsg: function (textMsg) { if (window.mode.isMobile()) { var msgData = JSON.parse(textMsg.substring('jsdialog:'.length + 1)); + if (msgData.type == 'borderwindow') + return; if (msgData.enabled) { this._openMobileWizard(msgData); } else { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits