haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

browser: rename makefile vars 

Change-Id: I883e23d2df6b273db6ba3462d6fc3da77567a976
Signed-off-by: Henry Castro <hcastro@collabora.com>
pull/3597/head
Henry Castro 2021-11-03 10:13:42 -04:00 committed by Jan Holesovsky
parent fa69e69306
commit f0b4cd9ef4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/bundle.js.m4
View File

@ -14,9 +14,9 @@ m4_syscmd([cat ]fileNode)
]) ])
m4_dnl imported libraries m4_dnl imported libraries
m4_foreachq([fileLib],[LOLEAFLET_LIBS_JS],[ m4_foreachq([fileLib],[COOL_LIBS_JS],[
m4_syscmd([cat ]fileLib) m4_syscmd([cat ]fileLib)
]) ])
m4_dnl bundled loleaflet m4_dnl bundled cool
m4_syscmd([cat ]LOLEAFLET_JS) m4_syscmd([cat ]COOL_JS)

2
browser/loleaflet-src.js.m4 → browser/cool-src.js.m4
View File

@ -8,6 +8,6 @@ m4_include(COPYRIGHT)m4_dnl
(function (window) { (function (window) {
m4_foreachq([fileJS],[LOLEAFLET_JS],[m4_syscmd([cat ]fileJS)]) m4_foreachq([fileJS],[COOL_JS],[m4_syscmd([cat ]fileJS)])
}(window)); }(window));

6
browser/html/cool.html.m4
View File

@ -119,7 +119,7 @@ window.isLocalStorageAllowed = (function() {
m4_ifelse(BUNDLE,[], m4_ifelse(BUNDLE,[],
<!-- Using individual CSS files --> <!-- Using individual CSS files -->
m4_foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="][m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/browser/%VERSION%/])][fileCSS" /> m4_foreachq([fileCSS],[COOL_CSS],[<link rel="stylesheet" href="][m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/browser/%VERSION%/])][fileCSS" />
]), ]),
[<!-- Dynamically load the bundle.css --> [<!-- Dynamically load the bundle.css -->
<script> <script>
@ -329,14 +329,14 @@ document.getElementsByTagName("head")[[0]].appendChild(brandingLink);
m4_ifelse(MOBILEAPP,[true], m4_ifelse(MOBILEAPP,[true],
<!-- This is for a mobile app so the script files are in the same folder --> <!-- This is for a mobile app so the script files are in the same folder -->
m4_ifelse(BUNDLE,[],m4_foreachq([fileJS],[LOLEAFLET_JS], m4_ifelse(BUNDLE,[],m4_foreachq([fileJS],[COOL_JS],
[ <script src="fileJS" defer></script> [ <script src="fileJS" defer></script>
]), ]),
[ <script src="bundle.js" defer></script> [ <script src="bundle.js" defer></script>
]), ]),
m4_ifelse(BUNDLE,[], m4_ifelse(BUNDLE,[],
<!-- Using indivisual JS files --> <!-- Using indivisual JS files -->
m4_foreachq([fileJS],[LOLEAFLET_JS], m4_foreachq([fileJS],[COOL_JS],
[ <script src="%SERVICE_ROOT%/browser/%VERSION%/fileJS" defer></script> [ <script src="%SERVICE_ROOT%/browser/%VERSION%/fileJS" defer></script>
]), ]),
[ [