[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/Map.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0868d19bb7598d45c86aae1bb66dfe5394926d5b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 22 13:26:51 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 22 13:33:44 2019 +0200

    Make the ruler show up in the iOS app on iPad
    
    Sadly there is a gap between the toolbar and the ruler on iPad (but
    not when running web-based Online from the same sources). Need to
    figure out what is going on there.
    
    Change-Id: I54b3f8470c1e91005633de26d6e8bb4edc39287a

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 8720f3c1e..7f3713bc1 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -186,7 +186,7 @@ L.Map = L.Evented.extend({
 			if (!this.initComplete) {
 				this._fireInitComplete('doclayerinit');
 			}
-			if (!L.Browser.mobile && this._docLayer._docType == 'text') {
+			if (((window.ThisIsTheiOSApp && window.mode.isTablet()) || !L.Browser.mobile) && this._docLayer._docType == 'text') {
 				var interactiveRuler = this._permission === 'edit' ? true : false;
 				L.control.ruler({position:'topleft', interactive:interactiveRuler}).addTo(this);
 			}