[Libreoffice-commits] online.git: loleaflet/src

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 6 13:46:11 UTC 2019


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

New commits:
commit 99a6839cb2b7a4daaa07ad5d629a1f29849cb9fb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 22 13:26:51 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 6 14:44:56 2019 +0100

    tdf#128468: Make the ruler show up in the iOS app on iPad
    
    (cherry picked from commit 0868d19bb7598d45c86aae1bb66dfe5394926d5b)
    
    Change-Id: I54b3f8470c1e91005633de26d6e8bb4edc39287a
    Reviewed-on: https://gerrit.libreoffice.org/84046
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index ffde80719..9554e3386 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -191,7 +191,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);
 			}


More information about the Libreoffice-commits mailing list