loleaflet/src/control/Control.Menubar.js | 2 +-
loleaflet/src/control/Control.Toolbar.js | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 232fdf5dcbc0c8f5b46a52353796f44cb34eca4b
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Aug 19 18:41:55 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Aug 20 10:54:29 2019 +0200
tdf#126972: The "file icon" button in the menubar is useless in the iOS app
In "real" Online, in a WOPI environment, it does something useful. But
not in the iOS app. So no need to have it at all.
Change-Id: I87a6b7badcba2899f850a1e15eae591e9ed8895c
Reviewed-on: https://gerrit.libreoffice.org/77742
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit c5d6c7dd402da6987cd01f3c0759b28b3503d85c)
Reviewed-on: https://gerrit.libreoffice.org/77788
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3a845f926..41120cfc2 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -560,7 +560,7 @@ L.Control.Menubar = L.Control.extend({
});
$('#main-menu').attr('tabindex', 0);
- if (this._map._permission !== 'readonly') {
+ if (!window.ThisIsTheiOSApp && this._map._permission !==
'readonly') {
this._createFileIcon();
}
},
commit a91025e998e1835947b6bc2da5b26350c6dc886b
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Aug 19 18:35:29 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Aug 20 10:54:14 2019 +0200
tdf#126972: Don't fold the menubar in the iOS app on a tablet
As the menubar is now then always visible in that case, no need to
have the hamburger button in the toolbar either.
Change-Id: Iec1ae28858ad994d008c294e5fa4069c5e9bc7ed
Reviewed-on: https://gerrit.libreoffice.org/77740
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/77787
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 1e302892b..29e5c2590 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -47,7 +47,10 @@ function _updateVisibilityForToolbar(toolbar) {
var toHide = [];
toolbar.items.forEach(function(item) {
- if (((isMobile && item.mobile === false) || (isTablet &&
item.tablet === false) || (isDesktop && item.desktop === false) ||
(!window.ThisIsAMobileApp && item.mobilebrowser === false)) && !item.hidden) {
+ if (window.ThisIsTheiOSApp && isTablet && item.iosapptablet ===
false) {
+ toHide.push(item.id);
+ }
+ else if (((isMobile && item.mobile === false) || (isTablet &&
item.tablet === false) || (isDesktop && item.desktop === false) ||
(!window.ThisIsAMobileApp && item.mobilebrowser === false)) && !item.hidden) {
toHide.push(item.id);
}
else if (((isMobile && item.mobile === true) || (isTablet &&
item.tablet === true) || (isDesktop && item.desktop === true) ||
(window.ThisIsAMobileApp && item.mobilebrowser === true)) && item.hidden) {
@@ -822,7 +825,7 @@ function initNormalToolbar() {
{type: 'spacer'},
{type: 'button', id: 'edit', img: 'edit'},
{type: 'button', id: 'fold', img: 'fold', desktop: true,
mobile: false, hidden: true},
- {type: 'button', id: 'hamburger-tablet', img: 'hamburger',
desktop: false, mobile: false, tablet: true, hidden: true}
+ {type: 'button', id: 'hamburger-tablet', img: 'hamburger',
desktop: false, mobile: false, tablet: true, iosapptablet: false, hidden: true}
];
var toolbar = $('#toolbar-up');
@@ -1498,7 +1501,7 @@ function onDocLayerInit() {
toolbarUp.refresh();
statusbar.refresh();
- if (window.mode.isTablet()) {
+ if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
map.hideMenubar();
$('#document-container').addClass('tablet');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
