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

[Jan Holesovsky (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 117dddea3c6fded249b09814d116d46e18e7f63e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Mar 30 16:54:28 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Mar 31 20:30:03 2020 +0200

    mobile detection: Simplify the macro to write down the css files.
    
    Shouldn't affect functionality.
    
    Change-Id: Iff2292403297a1ed88d781d3eb8ebe44c46f32fe
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91414
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 84fd50b15..bee43b754 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -90,18 +90,12 @@ var Base64ToArrayBuffer = function(base64Str) {
 
 </script>
 
-m4_ifelse(MOBILEAPP,[true],
-  [m4_ifelse(DEBUG,[true],
-    m4_foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="fileCSS" />
-  ]),
-    [<style>m4_syscmd([cat ]BUNDLE_CSS)</style>
-  ])],
-  [m4_ifelse(DEBUG,[true],
-    m4_foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/fileCSS" />
-  ]),
-    [<style>m4_syscmd([cat ]BUNDLE_CSS)</style>
-  ])]m4_dnl
-)m4_dnl
+m4_dnl In the debug case, just write all the .css files here
+m4_ifelse(DEBUG,[true],
+  m4_foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="][m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])][fileCSS" />
+]),
+  [<style>m4_syscmd([cat ]BUNDLE_CSS)</style>
+])
 <!--%BRANDING_CSS%--> <!-- add your logo here -->
 m4_ifelse(IOSAPP,[true],
   [<link rel="stylesheet" href="Branding/branding.css">])