[Libreoffice-commits] online.git: 2 commits - loleaflet/Makefile loleaflet/spec

Fri Dec 4 03:01:07 PST 2015

loleaflet/Makefile            |    1 +
 loleaflet/spec/tilebench.html |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 7c4d91d3adb4d48c2661530a11e7af3c644cf5b4
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Fri Dec 4 12:57:52 2015 +0200

    loleaflet: jquery is needed by vex in tilebench

diff --git a/loleaflet/spec/tilebench.html b/loleaflet/spec/tilebench.html
index 8f4cdb1..6a0dbaf 100644
--- a/loleaflet/spec/tilebench.html
+++ b/loleaflet/spec/tilebench.html
@@ -11,6 +11,7 @@
 <body>
 	<div id="mocha"></div>
 	<script src="expect.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 	<script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
 	<script type="text/javascript" src="../node_modules/happen/happen.js"></script>
 	<script type="text/javascript" src="sinon.js"></script>
commit e36d6a06849a57105585bd0fc880a84989f2550b
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Fri Dec 4 12:57:11 2015 +0200

    loleaflet: run npm install before packaging

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4261f93..2f8a940 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -9,6 +9,7 @@ VERSION=1.4.19
 DRAW_VERSION=0.2.4
 
 all:
+	npm install
 	jake build
 	cd plugins/draw-$(DRAW_VERSION) && jake build
 
