loleaflet/Makefile.am | 6 +-----
loleaflet/build/deps.js | 6 ++++++
scripts/unocommands.py | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit c1ba96f951661ee047af9fabe20ce00a1527acfe
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Mar 11 14:27:47 2019 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Mon Mar 11 14:51:56 2019 -0400
loleaflet: move toolbar.js to src/control directory
Simplify building loleaflet.
TODO. Convert to L.Control.Toolbar
Change-Id: I6abedd19caa6f0c22267c661e67480507dcd8336
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d21a104d0..e64869516 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -309,7 +309,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
$(builddir)/dist/w2ui-1.5.rc1.js \
- $(builddir)/dist/toolbar.js \
$(builddir)/dist/main.js
@touch $@
else
@@ -337,7 +336,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
- $(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/uglify-js/bin/uglifyjs \
@@ -346,7 +344,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
$(builddir)/build/dist/loleaflet-src.js \
- $(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js \
--output $@
endif
@@ -366,7 +363,6 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
jquery.mCustomScrollbar.js \
w2ui-1.5.rc1.js \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
- toolbar.js \
main.js)" \
$(srcdir)/html/loleaflet.html.m4 > $@
@@ -448,7 +444,7 @@ pot:
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketSettings.js \
admin/src/Util.js \
- js/toolbar.js \
+ scr/control/toolbar.js \
src/control/Control.AlertDialog.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index ec9c8565a..c1247ab54 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -291,6 +291,12 @@ var deps = {
desc: 'Makes markers draggable (by mouse or touch).'
},
+ ControlToolbar: {
+ src: ['control/toolbar.js'],
+ heading: 'Controls',
+ desc: 'LibreOffice Online toolbar'
+ },
+
ControlPartsPreview: {
src: ['control/Control.js',
'control/Control.PartsPreview.js'],
diff --git a/loleaflet/js/toolbar.js b/loleaflet/src/control/toolbar.js
similarity index 100%
rename from loleaflet/js/toolbar.js
rename to loleaflet/src/control/toolbar.js
diff --git a/scripts/unocommands.py b/scripts/unocommands.py
index 27fca0d84..df29ef8e5 100755
--- a/scripts/unocommands.py
+++ b/scripts/unocommands.py
@@ -122,7 +122,7 @@ def extractToolbarCommands(path):
commands = []
# extract from the menu specifications
- f = open(path + '/loleaflet/js/toolbar.js', 'r')
+ f = open(path + '/loleaflet/src/control/toolbar.js', 'r')
for line in f:
if line.find("_UNO(") >= 0:
commands += commandFromMenuLine(line)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
