summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2020-09-25 15:35:14 -0400
committerHenry Castro <hcastro@collabora.com>2020-09-28 14:29:30 +0200
commit3d0a27636c3427f1530c77ee022800ea26952825 (patch)
treefdadf85695627c49aa663addb46856f1f1cd9f82
parent5c023938a366f44bbe922214fb8727146d18e127 (diff)
loleaflet: move the file "viamapi-client.js"
The file is not part of the leaflet files. It is better to move it to the external library location Change-Id: I12fb9684571db360b03a2e7c343725fd42b6848a Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103419 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
-rw-r--r--loleaflet/.eslintignore2
-rw-r--r--loleaflet/Makefile.am4
-rw-r--r--loleaflet/js/viamapi-client.js (renamed from loleaflet/src/viamapi-client.js)0
3 files changed, 3 insertions, 3 deletions
diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 64caf1af1..65f6b3856 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -7,7 +7,7 @@
**/js/l10n.js
**/js/w2ui-1.5.rc1.js
**/src/unocommands.js
-**/src/viamapi-client.js
+**/js/viamapi-client.js
#
# This is way too ugly for eslint...
**/js/jquery.mCustomScrollbar.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 7c1958029..b85201b8f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -167,7 +167,8 @@ endif
LOLEAFLET_LIBS_JS +=\
jquery.mCustomScrollbar.js \
- w2ui-1.5.rc1.js
+ w2ui-1.5.rc1.js \
+ viamapi-client.js
NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
NODE_MODULES_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(NODE_MODULES_JS))
@@ -179,7 +180,6 @@ LOLEAFLET_JS =\
src/Leaflet.js \
src/errormessages.js \
src/unocommands.js \
- src/viamapi-client.js \
src/core/Log.js \
src/core/Util.js \
src/core/LOUtil.js \
diff --git a/loleaflet/src/viamapi-client.js b/loleaflet/js/viamapi-client.js
index 691f1eb12..691f1eb12 100644
--- a/loleaflet/src/viamapi-client.js
+++ b/loleaflet/js/viamapi-client.js