[Libreoffice-commits] online.git: loleaflet/admin loleaflet/html loleaflet/loleaflet.html.m4 loleaflet/Makefile.am

[Henry Castro]

 loleaflet/Makefile.am             |    4 ++--
 loleaflet/admin/adminHistory.html |    9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 9f456079e128272fffa37ea82f2bf548a07a93de
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun May 27 09:16:52 2018 -0400

    loleaflet: remove the script tags that they already were bundled them
    
    Change-Id: I791c6c6850b39d5327c5c3c521138531f3a6f148

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 331e9ebad..3b15d68ca 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -183,7 +183,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 		--source-map --output $@
 endif
 
-$(builddir)/dist/loleaflet.html: $(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) \
+$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) \
 	$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
 	@echo "Generating loleaflet.html..."
 	@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
@@ -192,7 +192,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DS
 		$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
 		$(patsubst %.js,plugins/draw-$(DRAW_VERSION)/%.js,$(call LOLEAFLET_JS,$(srcdir)/plugins/draw-$(DRAW_VERSION)/build/build.js)) \
 		$(PLUGINS_JS))" \
-		$(srcdir)/loleaflet.html.m4 > $@
+		$(srcdir)/html/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
 	@npm install
diff --git a/loleaflet/admin/adminHistory.html b/loleaflet/admin/adminHistory.html
index 7245a3d04..4752f8a07 100644
--- a/loleaflet/admin/adminHistory.html
+++ b/loleaflet/admin/adminHistory.html
@@ -72,14 +72,5 @@
       </div>
     </div>
 <!--%FOOTER%-->
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../dist/bootstrap/js/bootstrap.min.js"></script>
-    <!-- Just to make our placeholder images work. Don't actually copy the next line! -->
-    <script src="../../dist/bootstrap/assets/js/vendor/holder.min.js"></script>
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../dist/bootstrap/assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/loleaflet/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
similarity index 100%
rename from loleaflet/loleaflet.html.m4
rename to loleaflet/html/loleaflet.html.m4