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

[Libreoffice Gerrit user]

 loleaflet/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit ab1e7ccc8701304aeedf7fb00bb91d216eecce2c
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed May 15 11:02:49 2019 -0400
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed May 15 17:42:23 2019 +0200

    loleaflet: makefile: do not bundle global.js file
    
    The file is expanded in loleaflet.html so avoid bundle the file
    
    Change-Id: I0123039cd19cfc4a12b49ab8ec492953c7d1d578
    Reviewed-on: https://gerrit.libreoffice.org/72371
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5054070fa..d10734511 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -230,7 +230,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 	$(srcdir)/js/main.js
 	@echo "Uglify loleaflet js files..."
 	NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglify-js/bin/uglifyjs \
-		$(srcdir)/js/global.js \
 		$(L10N_IOS_ALL_JS) \
 		$(NODE_MODULES_JS) \
 		$(srcdir)/js/jquery.mCustomScrollbar.js \