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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 9 22:05:47 UTC 2018


 loleaflet/html/loleaflet.html.m4 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e0bfd8271b6079535230eaa8ffdc24012d989702
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 23:59:34 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sat Nov 10 00:04:28 2018 +0200

    Fix MOBILEAPP fallout from c74c9e39c8821e02a51507cc9c811aaa2062237a
    
    In the mobile app, we don't run loleaflet.html through any filter that
    would replace strings like <!--%DOCUMENT_CONTAINER_TOP%-->. We need to
    produce a proper loleaflet.html at build time, using m4 for MOBILEAPP
    conditionals.
    
    Without this small fix, the loleaflet.html page ended up looking
    extremely weird (all white document area), with nothing working.

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index c29ef64c0..f05ed2f27 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -110,7 +110,8 @@ ifelse(MOBILEAPP,[true],
 
     <div id="spreadsheet-row-column-frame"></div>
 
-    <div id="document-container" style="top: <!--%DOCUMENT_CONTAINER_TOP%-->;">
+    <div id="document-container" style="top: ifelse(MOBILEAPP,[true],[70px],[<!--%DOCUMENT_CONTAINER_TOP%-->]);">
+
       <div id="map"></div>
     </div>
     <div id="spreadsheet-toolbar"></div>


More information about the Libreoffice-commits mailing list