subject:"\[Libreoffice\-commits\] online.git\: loleaflet\/Makefile.am"

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

2020-09-25 Thread Andras Timar (via logerrit)

 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1064870312958b5e687114be8ced6862ac1e4311
Author: Andras Timar 
AuthorDate: Fri Sep 25 15:25:46 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Sep 25 15:34:29 2020 +0200

loleaflet: makefile: add back welcome message

Change-Id: I387a247da2e0c2d6f6f3813d47f1a635691a34df
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103338
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 20dbcb80d..7c1958029 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -461,6 +461,7 @@ $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
 
 $(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
$(LOLEAFLET_HTML_DST) \
+   $(LOLEAFLET_WELCOME_DST) \
$(DIST_FOLDER)/bundle.css \
$(DIST_FOLDER)/global.js \
$(DIST_FOLDER)/bundle.js
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-08-14 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 22fd4ebaa6b7fe43cfcf97f3d8ad4b215d86df0e
Author: Henry Castro 
AuthorDate: Mon Jul 6 15:25:36 2020 -0400
Commit: Henry Castro 
CommitDate: Fri Aug 14 15:42:13 2020 +0200

admin: fix build when builddir != srcdir

Change-Id: If29863c06a8c296d5d4b7c37f0f6473e949e4371
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98223
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 729fd05e8..44c4886fa 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -89,7 +89,6 @@ LOLEAFLET_ADMIN_TS =\
 LOLEAFLET_ADMIN_TS_JS = $(patsubst 
%.ts,$(TYPESCRIPT_JS_DIR)/%.js,$(LOLEAFLET_ADMIN_TS))
 
 LOLEAFLET_ADMIN_JS =\
-   $(LOLEAFLET_ADMIN_TS_JS) \
admin/src/Base.js \
admin/src/Admin.js \
admin/src/AdminSocketBase.js \
@@ -403,7 +402,7 @@ endif
 
 $(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
@mkdir -p $(dir $@)
-   $(srcdir)/node_modules/typescript/bin/tsc --outFile $@ $<
+   $(builddir)/node_modules/typescript/bin/tsc --outFile $@ $<
 
 build-loleaflet: \
$(LOLEAFLET_L10N_DST) \
@@ -432,11 +431,11 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if 
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_JS)
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_TS_JS) 
$(LOLEAFLET_ADMIN_JS)
@mkdir -p $(dir $@)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
-   @awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
+   @awk 'FNR == 1 {print ""} 1' $(LOLEAFLET_ADMIN_TS_JS) $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
 $(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
@mkdir -p $(dir $@)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-07-21 Thread Tomaž Vajngerl (via logerrit)

 loleaflet/Makefile.am   |1 
 loleaflet/src/control/Control.Scroll.js |2 
 loleaflet/src/layer/AnnotationManagerBase.js|1 
 loleaflet/src/layer/AnnotationManagerImpress.js |  346 
 loleaflet/src/layer/tile/ImpressTileLayer.js|  310 +
 5 files changed, 367 insertions(+), 293 deletions(-)

New commits:
commit 3141ba240377059a7709a445bb6041e4ed18b58f
Author: Tomaž Vajngerl 
AuthorDate: Sat Jul 18 22:12:36 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Jul 21 14:46:34 2020 +0200

AnnotationManagerImpress to manage annotations for Impress

and move thefunctionallity from ImpressTileLayer.js

Change-Id: I646432b677652983384ba53197b5a7af6dd035e0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99019
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index f6d063a76..049a0e977 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -322,6 +322,7 @@ LOLEAFLET_JS =\
src/map/anim/Map.FlyTo.js \
src/layer/AnnotationManagerBase.js \
src/layer/AnnotationManager.js \
+   src/layer/AnnotationManagerImpress.js \
src/control/Control.Scroll.Annotation.js \
src/layer/marker/Annotation.js \
src/layer/marker/DivOverlay.js \
diff --git a/loleaflet/src/control/Control.Scroll.js 
b/loleaflet/src/control/Control.Scroll.js
index 0cde2b4c9..9b0936088 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -167,7 +167,7 @@ L.Control.Scroll = L.Control.extend({
// Scrolling quickly via mousewheel messes up the annotations 
for some reason
// Triggering the layouting algorithm here, though unnecessary, 
fixes the problem.
// This is just a workaround till we find the root cause of why 
it messes up the annotations
-   if (this._map._docLayer._annotations.layout) {
+   if (this._map._docLayer._annotations && 
this._map._docLayer._annotations.layout) {
this._map._docLayer._annotations.layout();
}
},
diff --git a/loleaflet/src/layer/AnnotationManagerBase.js 
b/loleaflet/src/layer/AnnotationManagerBase.js
index b9e0975d5..967aae236 100644
--- a/loleaflet/src/layer/AnnotationManagerBase.js
+++ b/loleaflet/src/layer/AnnotationManagerBase.js
@@ -8,6 +8,7 @@
 L.AnnotationManagerBase = L.Class.extend({
initialize: function (map, options) {
this._map = map;
+   this._doclayer = this._map._docLayer;
this._initializeSpecific(options);
}
 });
diff --git a/loleaflet/src/layer/AnnotationManagerImpress.js 
b/loleaflet/src/layer/AnnotationManagerImpress.js
new file mode 100644
index 0..b3ba6422c
--- /dev/null
+++ b/loleaflet/src/layer/AnnotationManagerImpress.js
@@ -0,0 +1,346 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ *  L.AnnotationManagerImpress
+ */
+
+/* global L */
+
+L.AnnotationManagerImpress = L.AnnotationManagerBase.extend({
+   options: {
+   marginX: 40,
+   marginY: 10,
+   offset: 5,
+   extraSize: L.point(290, 0)
+   },
+   _initializeSpecific: function () {
+   this._map.on('zoomend', this._onAnnotationZoom, this);
+   this._map.on('AnnotationCancel', this.onAnnotationCancel, this);
+   this._map.on('AnnotationClick', this.onAnnotationClick, this);
+   this._map.on('AnnotationSave', this.onAnnotationSave, this);
+   this._map.on('AnnotationScrollUp', this.onAnnotationScrollUp, 
this);
+   this._map.on('AnnotationScrollDown', 
this.onAnnotationScrollDown, this);
+
+   this._annotations = {};
+   this._topAnnotation = [];
+   this._topAnnotation[this.getSelectedPart()] = 0;
+   this._selectedAnnotation = undefined;
+   this._draft = null;
+   },
+   getPartHashes: function() {
+   return this._doclayer._partHashes;
+   },
+   getPartHash: function(part) {
+   return this.getPartHashes()[part];
+   },
+   getSelectedPart: function() {
+   return this._doclayer._selectedPart;
+   },
+   getSelectedPartHash: function() {
+   var part = this.getSelectedPart();
+   return this.getPartHash(part);
+   },
+   getAnnotation: function (id) {
+   var annotations = this._annotations[this.getSelectedPartHash()];
+   for (var index in annotations) {
+   if (annotations[index]._data.id === id) {
+   return annotations[index];
+   }
+   }
+   return null;
+   },
+   newAnnotation: function (comment) {
+

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-07-20 Thread Tomaž Vajngerl (via logerrit)

 loleaflet/Makefile.am|1 +
 loleaflet/src/layer/AnnotationManager.js |5 ++---
 loleaflet/src/layer/AnnotationManagerBase.js |   13 +
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 2b313af4f3350794c0bf21c79eba41cd1ed79374
Author: Tomaž Vajngerl 
AuthorDate: Sat Jul 18 22:04:28 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Jul 20 22:49:11 2020 +0200

add AnnotationManagerBase to share code with other modules

Currently AnnotationManager is meant for Writer only, but it makes
sense to share the code with other modules too. This adds a new
base class AnnotationManagerBase which will contain the common
code for the annotation management. Other modules currently have
the annotations implemented in TileLayer, but this is the first
step to move them into its own annotation managers too.

Change-Id: I5131337aa95e43ce0844d57e2cc020239af5f100
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99018
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c2dc1f3c4..f6d063a76 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -320,6 +320,7 @@ LOLEAFLET_JS =\
src/dom/PosAnimation.Timer.js \
src/map/anim/Map.ZoomAnimation.js \
src/map/anim/Map.FlyTo.js \
+   src/layer/AnnotationManagerBase.js \
src/layer/AnnotationManager.js \
src/control/Control.Scroll.Annotation.js \
src/layer/marker/Annotation.js \
diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 59d7ce867..11224fd2a 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -5,7 +5,7 @@
 
 /* global $ */
 
-L.AnnotationManager = L.Class.extend({
+L.AnnotationManager = L.AnnotationManagerBase.extend({
options: {
marginX: 40,
marginY: 10,
@@ -13,8 +13,7 @@ L.AnnotationManager = L.Class.extend({
extraSize: L.point(290, 0)
},
 
-   initialize: function (map, options) {
-   this._map = map;
+   _initializeSpecific: function (options) {
this._items = [];
this._hiddenItems = 0;
this._selected = null;
diff --git a/loleaflet/src/layer/AnnotationManagerBase.js 
b/loleaflet/src/layer/AnnotationManagerBase.js
new file mode 100644
index 0..b9e0975d5
--- /dev/null
+++ b/loleaflet/src/layer/AnnotationManagerBase.js
@@ -0,0 +1,13 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ *  L.AnnotationManagerBase
+ */
+
+/* global L */
+
+L.AnnotationManagerBase = L.Class.extend({
+   initialize: function (map, options) {
+   this._map = map;
+   this._initializeSpecific(options);
+   }
+});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po loleaflet/src

2020-07-20 Thread Mike Kaganski (via logerrit)

 loleaflet/Makefile.am   |1 +
 loleaflet/po/templates/loleaflet-ui.pot |   10 ++
 loleaflet/src/control/Permission.js |   12 +++-
 loleaflet/src/core/Socket.js|4 
 4 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 0c99f6830bb651b2bfa7243e8325358c6628ed08
Author: Mike Kaganski 
AuthorDate: Tue Jul 14 20:33:13 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jul 20 15:47:53 2020 +0200

Warn user when the document could not be locked

Change-Id: I66b584f5e95fd82dc5cb27d10d9629cf19cb61bd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98782
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index dfc9d5984..c2dc1f3c4 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -621,6 +621,7 @@ pot:
src/control/Control.NotebookbarCalc.js \
src/control/Control.NotebookbarImpress.js \
src/control/Control.NotebookbarBuilder.js \
+   src/control/Permission.js \
src/control/Ruler.js \
src/control/Signing.js \
src/control/Toolbar.js \
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 25924eda4..d715eca95 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -898,6 +898,16 @@ msgstr ""
 msgid "Start Presentation"
 msgstr ""
 
+#: src/control/Permission.js:42
+msgid "The document could not be locked, and is opened in read-only mode."
+msgstr ""
+
+#: src/control/Permission.js:44
+msgid ""
+"\n"
+"Server returned this reason: \""
+msgstr ""
+
 #: src/control/Ruler.js:366
 msgid "Left Margin"
 msgstr ""
diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index 3938fbc49..1ba08d90b 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -2,7 +2,7 @@
 /*
  * Document permission handler
  */
-/* global $ */
+/* global $ _ vex */
 L.Map.include({
setPermission: function (perm) {
if (perm === 'edit') {
@@ -38,6 +38,16 @@ L.Map.include({
}
},
 
+   onLockFailed: function(reason) {
+   var alertMsg = _('The document could not be locked, and is 
opened in read-only mode.');
+   if (reason) {
+   alertMsg += _('\nServer returned this reason: "') + 
reason + '"';
+   }
+
+   vex.dialog.alert({ message: alertMsg });
+   this.options.canTryLock = true;
+   },
+
_enterEditMode: function (perm) {
if (this.isPermissionReadOnly() && (window.mode.isMobile() || 
window.mode.isTablet())) {
this.sendInitUNOCommands();
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 790c7885d..5c9f61382 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -334,6 +334,10 @@ L.Socket = L.Class.extend({
 
return;
}
+   else if (textMsg.startsWith('lockfailed:')) {
+   
this._map.onLockFailed(textMsg.substring('lockfailed:'.length).trim());
+   return;
+   }
else if (textMsg.startsWith('wopi: ')) {
// Handle WOPI related messages
var wopiInfo = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-07-08 Thread Dennis Francis (via logerrit)

 loleaflet/Makefile.am|2 
 loleaflet/src/layer/vector/CircleMarker.js   |2 
 loleaflet/src/layer/vector/Path.Drag.js  |   11 
 loleaflet/src/layer/vector/Path.Transform.SVG.js |   36 ++
 loleaflet/src/layer/vector/Path.js   |  137 +
 loleaflet/src/layer/vector/Polygon.js|4 
 loleaflet/src/layer/vector/Polyline.js   |2 
 loleaflet/src/layer/vector/Renderer.js   |   67 
 loleaflet/src/layer/vector/SVG.js|   36 +-
 loleaflet/src/layer/vector/SVGGroup.js   |  224 ---
 loleaflet/src/layer/vector/SplitPanesRenderer.js |   59 
 loleaflet/src/layer/vector/SplitPanesSVG.js  |  323 +++
 12 files changed, 815 insertions(+), 88 deletions(-)

New commits:
commit a59076e1ca88a6f2c8c67ce45bf769e963cf0717
Author: Dennis Francis 
AuthorDate: Tue Jul 7 14:29:54 2020 +0530
Commit: Dennis Francis 
CommitDate: Wed Jul 8 16:57:44 2020 +0200

add split-panes support for overlay layer

(This is only for svg renderer)

There are separate svg DOM-nodes for each split-pane with view-box set
appropriately. The L.Path based objects are shared for each
split-pane, but there will be separate identical 'path' DOM-nodes for
each svg container.

This patch introduces L.SplitPanesRenderer/L.SplitPanesSVG (has
same external api as L.Renderer/L.SVG). These are wrapper classes to host
child renderers, one per split-pane and delegate calls to them
appropriately.

Change-Id: Id44e9a1312500e6b43cdd8e4f42e235b43d22772
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98354
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2b2dd22c8..589a95448 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -234,6 +234,8 @@ LOLEAFLET_JS =\
src/layer/vector/CircleMarker.js \
src/layer/vector/Circle.js \
src/layer/vector/SVG.js \
+   src/layer/vector/SplitPanesRenderer.js \
+   src/layer/vector/SplitPanesSVG.js \
src/layer/vector/Path.Transform.SVG.js \
src/core/Handler.js \
src/layer/vector/SVGGroup.js \
diff --git a/loleaflet/src/layer/vector/CircleMarker.js 
b/loleaflet/src/layer/vector/CircleMarker.js
index 837471440..0e45bddf6 100644
--- a/loleaflet/src/layer/vector/CircleMarker.js
+++ b/loleaflet/src/layer/vector/CircleMarker.js
@@ -66,7 +66,7 @@ L.CircleMarker = L.Path.extend({
},
 
_empty: function () {
-   return this._radius && 
!this._renderer._bounds.intersects(this._pxBounds);
+   return this._radius && 
!this._renderer.intersectsBounds(this._pxBounds);
}
 });
 
diff --git a/loleaflet/src/layer/vector/Path.Drag.js 
b/loleaflet/src/layer/vector/Path.Drag.js
index 4ca7ff847..b1375aacf 100644
--- a/loleaflet/src/layer/vector/Path.Drag.js
+++ b/loleaflet/src/layer/vector/Path.Drag.js
@@ -72,9 +72,7 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends  
L.Path.Drag.prototype */ {
(this._path.options.className + ' ' + 
L.Handler.PathDrag.DRAGGING_CLS) :
 L.Handler.PathDrag.DRAGGING_CLS;
 
-   if (this._path._path) {
-   L.DomUtil.addClass(this._path._path, 
L.Handler.PathDrag.DRAGGING_CLS);
-   }
+   this._path.addClass(L.Handler.PathDrag.DRAGGING_CLS);
},
 
/**
@@ -85,9 +83,8 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends  
L.Path.Drag.prototype */ {
 
this._path.options.className = this._path.options.className
.replace(new RegExp('\\s+' + 
L.Handler.PathDrag.DRAGGING_CLS), '');
-   if (this._path._path) {
-   L.DomUtil.removeClass(this._path._path, 
L.Handler.PathDrag.DRAGGING_CLS);
-   }
+
+   this._path.removeClass(L.Handler.PathDrag.DRAGGING_CLS);
 
if (!this._path.options.manualDrag) {
L.DomEvent.off(document, 'mousemove touchmove', 
this._onDrag,this);
@@ -119,7 +116,7 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends  
L.Path.Drag.prototype */ {
this._matrix = [1, 0, 0, 1, 0, 0];
L.DomEvent.stop(evt.originalEvent);
 
-   L.DomUtil.addClass(this._path._renderer._container, 
'leaflet-interactive');
+   this._path._renderer.addContainerClass('leaflet-interactive');
 
if (!this._path.options.manualDrag) {
L.DomEvent
diff --git a/loleaflet/src/layer/vector/Path.Transform.SVG.js 
b/loleaflet/src/layer/vector/Path.Transform.SVG.js
index fb76c9cf6..4abc4528a 100644
--- a/loleaflet/src/layer/vector/Path.Transform.SVG.js
+++ b/loleaflet/src/layer/vector/Path.Transform.SVG.js
@@ -4,7 +4,7 @@ L.SVG.include({
 * Reset transform

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-07-08 Thread Dennis Francis (via logerrit)

 loleaflet/Makefile.am|1 
 loleaflet/src/layer/SplitPanesContext.js |  218 +++
 2 files changed, 219 insertions(+)

New commits:
commit 5f174075489365956d451d46e2a4839f7beff811
Author: Dennis Francis 
AuthorDate: Tue Jul 7 12:43:32 2020 +0530
Commit: Dennis Francis 
CommitDate: Wed Jul 8 16:49:59 2020 +0200

introduce SplitPanesContext class

This will store the split position and notify others and update the
splitters when someone changes this.

Change-Id: Ic1a2d665c972c369ce4e1362d0add50f72125d8a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98350
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 762c2079a..49faf56f1 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -201,6 +201,7 @@ LOLEAFLET_JS =\
src/layer/Layer.js \
src/layer/tile/GridLayer.js \
src/layer/tile/TileLayer.js \
+   src/layer/SplitPanesContext.js \
src/layer/tile/TileLayer.TableOverlay.js \
src/layer/ObjectFocusDarkOverlay.js \
src/layer/tile/WriterTileLayer.js \
diff --git a/loleaflet/src/layer/SplitPanesContext.js 
b/loleaflet/src/layer/SplitPanesContext.js
new file mode 100644
index 0..5d4909298
--- /dev/null
+++ b/loleaflet/src/layer/SplitPanesContext.js
@@ -0,0 +1,218 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * SplitPanesContext stores positions/sizes/objects related to split panes.
+ */
+
+/* global */
+
+L.SplitPanesContext = L.Class.extend({
+
+   options: {
+   maxHorizontalSplitPercent: 70,
+   maxVerticalSplitPercent: 70,
+   },
+
+   initialize: function (docLayer, createSplitters) {
+   console.assert(docLayer, 'no docLayer!');
+   console.assert(docLayer._map, 'no map!');
+
+   this._docLayer = docLayer;
+   this._map = docLayer._map;
+   this._setDefaults();
+
+   if (createSplitters === true) {
+   this.updateSplitters();
+   }
+   },
+
+   _setDefaults: function () {
+   this._splitPos = new L.Point(0, 0);
+   },
+
+   setDefaults: function () {
+   this._setDefaults();
+   this.updateSplitters();
+   },
+
+   getMaxSplitPosX: function () {
+   var rawMax = Math.floor(this._map.getSize().x * 
this.options.maxHorizontalSplitPercent / 100);
+   return this._docLayer.getSnapDocPosX(rawMax);
+   },
+
+   getMaxSplitPosY: function () {
+   var rawMax = Math.floor(this._map.getSize().y * 
this.options.maxVerticalSplitPercent / 100);
+   return this._docLayer.getSnapDocPosY(rawMax);
+   },
+
+   setSplitPos: function (splitX, splitY) {
+
+   this.setHorizSplitPos(splitX);
+   this.setVertSplitPos(splitY);
+   },
+
+   alignSplitPos: function () {
+   this.alignHorizSplitPos();
+   this.alignVertSplitPos();
+   },
+
+   getSplitPos: function () {
+   return this._splitPos.clone();
+   },
+
+   getSplitPosX: function () {
+   return this._splitPos.x;
+   },
+
+   getSplitPosY: function () {
+   return this._splitPos.y;
+   },
+
+   justifySplitPos: function (split, isHoriz) {
+   if (split <= 0) {
+   return 0;
+   }
+
+   var maxSplitPos = isHoriz ? this.getMaxSplitPosX() : 
this.getMaxSplitPosY();
+   if (split >= maxSplitPos) {
+   return maxSplitPos;
+   }
+
+   return isHoriz ? this._docLayer.getSnapDocPosX(split) :
+   this._docLayer.getSnapDocPosY(split);
+   },
+
+   setHorizSplitPos: function (splitX) {
+
+   console.assert(typeof splitX === 'number', 'splitX must be a 
number');
+
+   if (this._splitPos.x === splitX) {
+   return;
+   }
+
+   this._splitPos.x = this.justifySplitPos(splitX, true /* isHoriz 
*/);
+
+   this._updateXSplitter();
+   this._map.fire('splitposchanged');
+   },
+
+   setVertSplitPos: function (splitY) {
+
+   console.assert(typeof splitY === 'number', 'splitY must be a 
number');
+
+   if (this._splitPos.y === splitY) {
+   return;
+   }
+
+   this._splitPos.y = this.justifySplitPos(splitY, false /* 
isHoriz */);
+
+   this._updateYSplitter();
+   this._map.fire('splitposchanged');
+   },
+
+   alignHorizSplitPos: function () {
+   this._splitPos.x = 
this._docLayer.getSnapDocPosX(this._splitPos.x);
+   this._updateXSplitter();
+   },
+
+   alignVertSplitPos: function

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

2020-06-25 Thread Jan Holesovsky (via logerrit)

 loleaflet/Makefile.am |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d91e5cd682afbbf26170c5a8d7b731dd03328842
Author: Jan Holesovsky 
AuthorDate: Wed Jun 24 22:23:50 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Jun 25 09:41:28 2020 +0200

Fix dependencies of the TypeScript file.

The assumption is that the amount of TS files will grow; so move away
from a generic 'tsc' call that is supposed to walk through the tree with
exact calling that for the files that have been changed.

This should hopefully finally sort out the Jenkins problems with
ModalDialogCreator.tsj

Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9d9c991e6..762c2079a 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -6,6 +6,7 @@ BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
 IS_DEBUG = $(if $(filter DEBUG,$(BUNDLE)),true,)
 
 DIST_FOLDER ?= $(builddir)/dist
+TYPESCRIPT_JS_DIR = $(builddir)/typescript_js
 
 export NODE_PATH=$(abs_builddir)/node_module
 
@@ -82,7 +83,13 @@ define npm_source
done
 endef
 
+LOLEAFLET_ADMIN_TS =\
+   admin/src/ModalDialogCreator.ts
+
+LOLEAFLET_ADMIN_TS_JS = $(patsubst 
%.ts,$(TYPESCRIPT_JS_DIR)/%.js,$(LOLEAFLET_ADMIN_TS))
+
 LOLEAFLET_ADMIN_JS =\
+   $(LOLEAFLET_ADMIN_TS_JS) \
admin/src/Base.js \
admin/src/Admin.js \
admin/src/AdminSocketBase.js \
@@ -91,8 +98,7 @@ LOLEAFLET_ADMIN_JS =\
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketSettings.js \
admin/src/AdminSocketHistory.js \
-   admin/src/AdminSocketLog.js \
-   admin/src/ModalDialogCreator.js
+   admin/src/AdminSocketLog.js
 
 NODE_MODULES_SRC =\
autolinker@3.14.1 \
@@ -388,11 +394,11 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
 endif
 
-compilets:
-   $(srcdir)/node_modules/typescript/bin/tsc
-   @touch $@
+$(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
+   @mkdir -p $(dir $@)
+   $(srcdir)/node_modules/typescript/bin/tsc --outFile $@ $<
 
-build-loleaflet: compilets \
+build-loleaflet: \
$(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
@@ -419,13 +425,13 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if 
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL) compilets
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_JS)
@mkdir -p $(dir $@)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet) compilets
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
@mkdir -p $(dir $@)
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
@echo "Checking for loleaflet JS errors..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-11 Thread Jan Holesovsky (via logerrit)

 loleaflet/Makefile.am |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 23ebfe20075fdf92e1ac667bfce111f23ad10d3a
Author: Jan Holesovsky 
AuthorDate: Thu Jun 11 12:37:11 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Jun 11 12:37:11 2020 +0200

Add compilets dependency so that make -j works again.

Change-Id: I185891fbcb340d2d2a94b9e2fe033534da9c2f08

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ff2071a04..b79a89f00 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -394,6 +394,7 @@ endif
 
 compilets:
$(srcdir)/node_modules/typescript/bin/tsc
+   @touch $@
 
 build-loleaflet: compilets \
$(LOLEAFLET_L10N_DST) \
@@ -422,13 +423,13 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if 
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL) compilets
@mkdir -p $(dir $@)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet) compilets
@mkdir -p $(dir $@)
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
@echo "Checking for loleaflet JS errors..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 684a0d2ef43d17a2e939ec021caf6519a40c0cce
Author: Henry Castro 
AuthorDate: Wed May 27 11:31:03 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 04:22:50 2020 +0200

loleaflet: makefile: replace ENABLE_DEBUG var

Now, it does not depend on ./configure script
it is configurable to set BUNDLE=DEBUG or RELEASE (i.e. Android platform)

Change-Id: Id43f156a05ea22f74334e7fdbe60d53b8b5a2891
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94982
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4f6c29a19..47fd0c4c5 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -2,6 +2,8 @@ MAKEFLAGS = --no-builtin-rules
 CTAGS = ctags
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
+BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
+IS_DEBUG = $(if $(filter DEBUG,$(BUNDLE)),true,)
 
 if ENABLE_ANDROIDAPP
 DIST_FOLDER = $(abs_top_srcdir)/android/lib/src/main/assets/dist
@@ -141,7 +143,7 @@ LOLEAFLET_CSS_M4 = $(strip $(foreach 
file,$(LOLEAFLET_CSS),$(notdir $(file
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
 
 NODE_MODULES_JS =\
-   $(if $(filter 
true,$(ENABLE_DEBUG)),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js)
 \
+   $(if 
$(IS_DEBUG),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js)
 \
node_modules/jquery/dist/jquery.js \
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
@@ -326,8 +328,6 @@ INTERMEDIATE_DIR ?= $(abs_builddir)/build
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
-BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
-
 define bundle_loleaflet
$(if $(filter DEBUG,$(1)),\
@touch $@,
@@ -414,7 +414,7 @@ endif
 
 $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
-   @NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter 
true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
+   @NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if 
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
 $(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@mkdir -p $(dir $@)
@@ -448,7 +448,7 @@ $(DIST_FOLDER)/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 \
$(DIST_FOLDER)/global.js \
$(DIST_FOLDER)/bundle.js
@echo "Generating loleaflet.html..."
-   @m4 -PE -DDEBUG=$(ENABLE_DEBUG) \
+   @m4 -PE -DDEBUG=$(IS_DEBUG) \
-DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 9b0fd0d7c48fb676a1bc50c307fed28a2cf135fb
Author: Henry Castro 
AuthorDate: Thu May 28 12:08:06 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 04:23:06 2020 +0200

loleaflet: makefile: simplify IS_DEBUG var

Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 47fd0c4c5..5d96e3940 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -329,7 +329,7 @@ INTERMEDIATE_DIR ?= $(abs_builddir)/build
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
 define bundle_loleaflet
-   $(if $(filter DEBUG,$(1)),\
+   $(if $(IS_DEBUG),\
@touch $@,
@m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
@@ -342,22 +342,22 @@ define bundle_loleaflet
 endef
 
 define prereq_loleaflet
-   $(if $(filter DEBUG,$(1)),$(LOLEAFLET_JS_DST),$(LOLEAFLET_JS_SRC))
+   $(if $(IS_DEBUG),$(LOLEAFLET_JS_DST),$(LOLEAFLET_JS_SRC))
 endef
 
 define bundle_css
-   $(if $(filter DEBUG,$(1)),\
+   $(if $(IS_DEBUG),\
@touch $@,\
@echo "Uglify loleaflet css files..."
@$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@)
 endef
 
 define prereq_css
-   $(if $(filter DEBUG,$(1)),$(LOLEAFLET_CSS_DST),$(LOLEAFLET_CSS))
+   $(if $(IS_DEBUG),$(LOLEAFLET_CSS_DST),$(LOLEAFLET_CSS))
 endef
 
 define bundle_all
-   $(if $(filter DEBUG,$(1)),\
+   $(if $(IS_DEBUG),\
@touch $@,\
@echo "Uglify loleaflet js files..."
@m4 -PE -DL10N_IOS_ALL_JS=$(L10N_IOS_ALL_JS) \
@@ -371,12 +371,12 @@ define bundle_all
 endef
 
 define prereq_all
-   $(if $(filter DEBUG,$(1)),$(NODE_MODULES_JS_DST) 
$(LOLEAFLET_LIBS_JS_DST),\
+   $(if $(IS_DEBUG),$(NODE_MODULES_JS_DST) $(LOLEAFLET_LIBS_JS_DST),\
$(NODE_MODULES_JS_SRC) $(LOLEAFLET_LIBS_JS_SRC))
 endef
 
 define global_file
-   $(if $(filter DEBUG,$(1)),
+   $(if $(IS_DEBUG),
@cp $< $@,
@echo "Uglify global.js file..."
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@)
@@ -422,25 +422,25 @@ $(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet,$(BUNDLE))
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
@mkdir -p $(dir $@)
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
@echo "Checking for loleaflet JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
-   $(call bundle_loleaflet($(BUNDLE)))
+   $(call bundle_loleaflet)
 
-$(DIST_FOLDER)/bundle.css: $(call prereq_css,$(BUNDLE))
+$(DIST_FOLDER)/bundle.css: $(call prereq_css)
@mkdir -p $(dir $@)
-   $(call bundle_css,$(BUNDLE))
+   $(call bundle_css)
 
-$(DIST_FOLDER)/bundle.js: $(INTERMEDIATE_DIR)/loleaflet-src.js $(call 
prereq_all,$(BUNDLE))
+$(DIST_FOLDER)/bundle.js: $(INTERMEDIATE_DIR)/loleaflet-src.js $(call 
prereq_all)
@mkdir -p $(dir $@)
-   $(call bundle_all,$(BUNDLE))
+   $(call bundle_all)
 
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
@mkdir -p $(dir $@)
-   $(call global_file,$(BUNDLE))
+   $(call global_file)
 
 $(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
$(LOLEAFLET_HTML_DST) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f511d7d6756cb50a55dd77444ed3123cd9958081
Author: Henry Castro 
AuthorDate: Wed May 27 11:00:13 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 04:22:11 2020 +0200

loleaflet: makefile: update PHONY targets

Change-Id: I3201c3f155aae597871f682686a8acdba47ae8a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94979
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 6bf27c77e..44765b243 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -382,6 +382,8 @@ define global_file
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@)
 endef
 
+.PHONY: build-loleaflet
+
 all-local: build-loleaflet
 
 if !ENABLE_MOBILEAPP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

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

New commits:
commit 15d4d3156d62a5f6114d519a0b2c7660fa0bbc0b
Author: Henry Castro 
AuthorDate: Wed May 27 10:08:16 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 03:56:08 2020 +0200

loleaflet: makefile: move the command to check UNO commands

Change-Id: Ic841b0de22d3e62779fe0c112a33c942ba87b160
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94977
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ef34d4c5d..6bf27c77e 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -383,7 +383,6 @@ define global_file
 endef
 
 all-local: build-loleaflet
-   $(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 
 if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
@@ -422,6 +421,7 @@ $(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
 
 $(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet,$(BUNDLE))
@mkdir -p $(dir $@)
+   $(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
@echo "Checking for loleaflet JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

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

New commits:
commit 8f9eea9e7ac425d6c7a2130114b0c875a3b9085d
Author: Henry Castro 
AuthorDate: Wed May 27 09:54:06 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 03:30:18 2020 +0200

loleaflet: makefile: remove old depecrated expansion

I probably forgot to remove it

Change-Id: I0183605fdf07235a7e3d61e91893133690feb074
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94974
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 157705865..ef34d4c5d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -454,7 +454,7 @@ $(DIST_FOLDER)/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 \
-DGLOBAL_JS="$(DIST_FOLDER)/global.js" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
$(LOLEAFLET_LIBS_JS) \
-   $(call LOLEAFLET_JS,$(srcdir)/build/build.js))" \
+   $(LOLEAFLET_JS))" \
-DVENDOR="$(VENDOR)" \
$(srcdir)/html/loleaflet.html.m4 > $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 5abf8900ddce81910cdf349d9d21a5cc940f23aa
Author: Henry Castro 
AuthorDate: Tue May 26 20:17:22 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 03:12:01 2020 +0200

loleaflet: makefile: simplify global file rule

Change-Id: I9c9bf7fa48f8c9dcd318195235cb99e407215543
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94913
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b085eab02..157705865 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -375,6 +375,13 @@ define prereq_all
$(NODE_MODULES_JS_SRC) $(LOLEAFLET_LIBS_JS_SRC))
 endef
 
+define global_file
+   $(if $(filter DEBUG,$(1)),
+   @cp $< $@,
+   @echo "Uglify global.js file..."
+   @$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@)
+endef
+
 all-local: build-loleaflet
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 
@@ -428,12 +435,9 @@ $(DIST_FOLDER)/bundle.js: 
$(INTERMEDIATE_DIR)/loleaflet-src.js $(call prereq_all
@mkdir -p $(dir $@)
$(call bundle_all,$(BUNDLE))
 
-if ENABLE_DEBUG
-else
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
-   @echo "Uglify global.js file..."
-   @$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
-endif
+   @mkdir -p $(dir $@)
+   $(call global_file,$(BUNDLE))
 
 $(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
$(LOLEAFLET_HTML_DST) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 942fce4ea59ffc1d541515f27b93384da67cf6c7
Author: Henry Castro 
AuthorDate: Tue May 26 19:28:52 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 02:39:13 2020 +0200

loleaflet: makefile: simplify rule bundle.js

Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 20f14bc8c..b085eab02 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -356,6 +356,25 @@ define prereq_css
$(if $(filter DEBUG,$(1)),$(LOLEAFLET_CSS_DST),$(LOLEAFLET_CSS))
 endef
 
+define bundle_all
+   $(if $(filter DEBUG,$(1)),\
+   @touch $@,\
+   @echo "Uglify loleaflet js files..."
+   @m4 -PE -DL10N_IOS_ALL_JS=$(L10N_IOS_ALL_JS) \
+   -DNODE_MODULES_JS=$(subst 
$(SPACE),$(COMMA),$(NODE_MODULES_JS)) \
+   -DLOLEAFLET_LIBS_JS=$(subst 
$(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
+   -DLOLEAFLET_JS=$(INTERMEDIATE_DIR)/loleaflet-src.js \
+   $(srcdir)/bundle.js.m4 > $(INTERMEDIATE_DIR)/bundle.js
+   @$(NODE) node_modules/uglify-js/bin/uglifyjs \
+   $(INTERMEDIATE_DIR)/bundle.js \
+   --output $@)
+endef
+
+define prereq_all
+   $(if $(filter DEBUG,$(1)),$(NODE_MODULES_JS_DST) 
$(LOLEAFLET_LIBS_JS_DST),\
+   $(NODE_MODULES_JS_SRC) $(LOLEAFLET_LIBS_JS_SRC))
+endef
+
 all-local: build-loleaflet
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 
@@ -405,28 +424,15 @@ $(DIST_FOLDER)/bundle.css: $(call prereq_css,$(BUNDLE))
@mkdir -p $(dir $@)
$(call bundle_css,$(BUNDLE))
 
+$(DIST_FOLDER)/bundle.js: $(INTERMEDIATE_DIR)/loleaflet-src.js $(call 
prereq_all,$(BUNDLE))
+   @mkdir -p $(dir $@)
+   $(call bundle_all,$(BUNDLE))
+
 if ENABLE_DEBUG
-$(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_DST) \
-   $(INTERMEDIATE_DIR)/loleaflet-src.js \
-   $(LOLEAFLET_LIBS_JS_DST)
-   @touch $@
 else
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
@echo "Uglify global.js file..."
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
-
-$(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
-   $(INTERMEDIATE_DIR)/loleaflet-src.js \
-   $(LOLEAFLET_LIBS_JS_SRC)
-   @echo "Uglify loleaflet js files..."
-   @m4 -PE -DL10N_IOS_ALL_JS=$(L10N_IOS_ALL_JS) \
-   -DNODE_MODULES_JS=$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS)) 
\
-   -DLOLEAFLET_LIBS_JS=$(subst 
$(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
-   -DLOLEAFLET_JS=$(builddir)/build/dist/loleaflet-src.js \
-   $(srcdir)/bundle.js.m4 > $(INTERMEDIATE_DIR)/bundle.js
-   $(NODE) node_modules/uglify-js/bin/uglifyjs \
-   $(INTERMEDIATE_DIR)/bundle.js \
-   --output $@
 endif
 
 $(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit b86f226bec4455889c83ea5c015a921f1be8c177
Author: Henry Castro 
AuthorDate: Tue May 26 18:00:51 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 02:15:22 2020 +0200

loleaflet: makefile: simplify bundling CSS

So it can be flexible to bundle Debug or Release

Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c91e19cc7..20f14bc8c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -58,6 +58,7 @@ LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLE
 
 define file_target
 $(1): $(2)
+   @mkdir -p $$(dir $$@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $$< $$@`; \
else \
@@ -344,6 +345,17 @@ define prereq_loleaflet
$(if $(filter DEBUG,$(1)),$(LOLEAFLET_JS_DST),$(LOLEAFLET_JS_SRC))
 endef
 
+define bundle_css
+   $(if $(filter DEBUG,$(1)),\
+   @touch $@,\
+   @echo "Uglify loleaflet css files..."
+   @$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@)
+endef
+
+define prereq_css
+   $(if $(filter DEBUG,$(1)),$(LOLEAFLET_CSS_DST),$(LOLEAFLET_CSS))
+endef
+
 all-local: build-loleaflet
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 
@@ -389,19 +401,16 @@ $(INTERMEDIATE_DIR)/loleaflet-src.js: $(call 
prereq_loleaflet,$(BUNDLE))
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
$(call bundle_loleaflet($(BUNDLE)))
 
-if ENABLE_DEBUG
-$(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS_DST)
-   @touch $@
+$(DIST_FOLDER)/bundle.css: $(call prereq_css,$(BUNDLE))
+   @mkdir -p $(dir $@)
+   $(call bundle_css,$(BUNDLE))
 
+if ENABLE_DEBUG
 $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_DST) \
$(INTERMEDIATE_DIR)/loleaflet-src.js \
$(LOLEAFLET_LIBS_JS_DST)
@touch $@
 else
-$(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS)
-   @echo "Uglify loleaflet css files..."
-   @$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
-
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
@echo "Uglify global.js file..."
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   41 ++---
 1 file changed, 22 insertions(+), 19 deletions(-)

New commits:
commit 445ca4269a43497c792389a73e703adaf56ab0bf
Author: Henry Castro 
AuthorDate: Tue May 26 15:25:28 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 01:26:30 2020 +0200

loleaflet: makefile: simplify the rules for bundling loleaflet

So it can be flexible to bundle Debug or Release
and it can be used in other platform (i.e. Android)

Change-Id: Ia98abc0711c98b8f34654956534ce414f34dbdb4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94891
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 583198820..c91e19cc7 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -325,6 +325,25 @@ INTERMEDIATE_DIR := $(if $(filter 
true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_bu
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
+BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
+
+define bundle_loleaflet
+   $(if $(filter DEBUG,$(1)),\
+   @touch $@,
+   @m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
+   -DGTKAPP=$(ENABLE_GTKAPP) \
+   -DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
+   -DMOBILEAPPNAME="$(APP_NAME)" \
+   -DVERSION=$(LOLEAFLET_VERSION) \
+   -DCOPYRIGHT=$(srcdir)/src/copyright.js \
+   -DLOLEAFLET_JS=$(subst $(SPACE),$(COMMA),$(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_JS))) \
+   $(srcdir)/loleaflet-src.js.m4 > $@)
+endef
+
+define prereq_loleaflet
+   $(if $(filter DEBUG,$(1)),$(LOLEAFLET_JS_DST),$(LOLEAFLET_JS_SRC))
+endef
+
 all-local: build-loleaflet
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 
@@ -363,16 +382,14 @@ $(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
-
-
-if ENABLE_DEBUG
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(LOLEAFLET_JS_DST)
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet,$(BUNDLE))
@mkdir -p $(dir $@)
@echo "Checking for loleaflet JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
-   @touch $@
+   $(call bundle_loleaflet($(BUNDLE)))
 
+if ENABLE_DEBUG
 $(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS_DST)
@touch $@
 
@@ -381,20 +398,6 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_LIBS_JS_DST)
@touch $@
 else
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
-   @mkdir -p $(dir $@)
-   @echo "Checking for loleaflet JS errors..."
-   @$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
-   $(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
-   @m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
-   -DGTKAPP=$(ENABLE_GTKAPP) \
-   -DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
-   -DMOBILEAPPNAME="$(APP_NAME)" \
-   -DVERSION=$(LOLEAFLET_VERSION) \
-   -DCOPYRIGHT=$(srcdir)/src/copyright.js \
-   -DLOLEAFLET_JS=$(subst $(SPACE),$(COMMA),$(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_JS))) \
-   $(srcdir)/loleaflet-src.js.m4 > $@
-
 $(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS)
@echo "Uglify loleaflet css files..."
@$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

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

New commits:
commit eedf587d51d381d5851ac019079c055a4d50cdd2
Author: Henry Castro 
AuthorDate: Tue May 26 14:07:52 2020 -0400
Commit: Henry Castro 
CommitDate: Fri May 29 01:11:06 2020 +0200

loleaflet: makefile: remove unnecessary prerequisite

Change-Id: Ifaa47e323f66235f6a18a832e738c04ccc9ef95e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94884
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9b5707c0f..583198820 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -338,7 +338,6 @@ build-loleaflet: $(LOLEAFLET_L10N_DST) \
$(LOLEAFLET_IMAGES_CUSTOM_DST) \
$(JQUERY_LIGHTNESS_DIST_IMAGES) \
$(JQUERY_MINIFIED_DIST_IMAGES) \
-   $(INTERMEDIATE_DIR)/loleaflet-src.js \
$(ADMIN_BUNDLE) \
$(DIST_FOLDER)/bundle.css \
$(DIST_FOLDER)/device-mobile.css \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5c9020ac66bf4c815696e81df10a5ef3fa3149fe
Author: Henry Castro 
AuthorDate: Tue May 26 10:45:55 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 28 23:05:23 2020 +0200

loleaflet: makefile: rename LOLEAFLET_PREFIX var

In order to not confuse it is renamed to INTERMEDIATE_DIR

Change-Id: Iccdea0d77b17c3d4285b891b79a408a795328d13
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94873
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 50fb781b9..9b5707c0f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -321,7 +321,7 @@ COMMA := ,
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h")
-LOLEAFLET_PREFIX := $(if $(filter 
true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_builddir)/build)
+INTERMEDIATE_DIR := $(if $(filter 
true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_builddir)/build)
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
@@ -338,7 +338,7 @@ build-loleaflet: $(LOLEAFLET_L10N_DST) \
$(LOLEAFLET_IMAGES_CUSTOM_DST) \
$(JQUERY_LIGHTNESS_DIST_IMAGES) \
$(JQUERY_MINIFIED_DIST_IMAGES) \
-   $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
+   $(INTERMEDIATE_DIR)/loleaflet-src.js \
$(ADMIN_BUNDLE) \
$(DIST_FOLDER)/bundle.css \
$(DIST_FOLDER)/device-mobile.css \
@@ -356,10 +356,10 @@ if ENABLE_ANDROIDAPP
 endif
 
 $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
-   $(LOLEAFLET_PREFIX)/dist/admin-src.js
-   @NODE_PATH=$(abs_builddir)/node_modules:$(LOLEAFLET_PREFIX)/dist 
$(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter 
true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
+   $(INTERMEDIATE_DIR)/admin-src.js
+   @NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) 
node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter 
true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
-$(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
@@ -367,7 +367,7 @@ $(LOLEAFLET_PREFIX)/dist/admin-src.js: 
$(LOLEAFLET_ADMIN_ALL)
 
 
 if ENABLE_DEBUG
-$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(LOLEAFLET_JS_DST)
@mkdir -p $(dir $@)
@echo "Checking for loleaflet JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
@@ -378,11 +378,11 @@ $(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS_DST)
@touch $@
 
 $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_DST) \
-   $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
+   $(INTERMEDIATE_DIR)/loleaflet-src.js \
$(LOLEAFLET_LIBS_JS_DST)
@touch $@
 else
-$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@mkdir -p $(dir $@)
@echo "Checking for loleaflet JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
@@ -405,16 +405,16 @@ $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
 
 $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
-   $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
+   $(INTERMEDIATE_DIR)/loleaflet-src.js \
$(LOLEAFLET_LIBS_JS_SRC)
@echo "Uglify loleaflet js files..."
@m4 -PE -DL10N_IOS_ALL_JS=$(L10N_IOS_ALL_JS) \
-DNODE_MODULES_JS=$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS)) 
\
-DLOLEAFLET_LIBS_JS=$(subst 
$(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
-DLOLEAFLET_JS=$(builddir)/build/dist/loleaflet-src.js \
-   $(srcdir)/bundle.js.m4 > $(LOLEAFLET_PREFIX)/dist/bundle.js
+   $(srcdir)/bundle.js.m4 > $(INTERMEDIATE_DIR)/bundle.js
$(NODE) node_modules/uglify-js/bin/uglifyjs \
-   $(LOLEAFLET_PREFIX)/dist/bundle.js \
+   $(INTERMEDIATE_DIR)/bundle.js \
--output $@
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit da49edd7d16ac47ec89009f7c55ebfe579eb480c
Author: Henry Castro 
AuthorDate: Tue May 26 09:20:50 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 28 22:46:05 2020 +0200

loleaflet: makefile: remove duplicates prerequisites

Change-Id: I409225be5f69524105967d3a72466ff284afc724
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94866
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 827d97b59..50fb781b9 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -418,9 +418,11 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
--output $@
 endif
 
-$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) $(LOLEAFLET_WELCOME_DST) $(DIST_FOLDER)/bundle.css 
$(DIST_FOLDER)/global.js \
-\
-   $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/bundle.js
+$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
+   $(LOLEAFLET_HTML_DST) \
+   $(DIST_FOLDER)/bundle.css \
+   $(DIST_FOLDER)/global.js \
+   $(DIST_FOLDER)/bundle.js
@echo "Generating loleaflet.html..."
@m4 -PE -DDEBUG=$(ENABLE_DEBUG) \
-DIOSAPP=$(ENABLE_IOSAPP) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

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

New commits:
commit 198709f5edff61d52479e0c42c970dbe908aef71
Author: Henry Castro 
AuthorDate: Tue May 26 10:03:25 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 28 22:30:15 2020 +0200

loleaflet: makefile: remove order only prerequisites

This is no longer required, now node_modules is installed
before invoking "all" target

Change-Id: I720f1906f2f88b104d560a096f51344edebfab44
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94870
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1a1f6ce13..827d97b59 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -332,7 +332,7 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
 endif
 
-build-loleaflet: | $(LOLEAFLET_L10N_DST) \
+build-loleaflet: $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
$(LOLEAFLET_IMAGES_CUSTOM_DST) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 81ec172a1030df461dd9d210e32179217abe368b
Author: Henry Castro 
AuthorDate: Tue May 26 08:36:34 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 28 22:06:51 2020 +0200

loleaflet: makefile: simplify NODE_PATH var

Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 00e77e662..1a1f6ce13 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -9,6 +9,8 @@ else
 DIST_FOLDER = $(builddir)/dist
 endif
 
+export NODE_PATH=$(abs_builddir)/node_module
+
 if !ENABLE_MOBILEAPP
 L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(DIST_FOLDER)/l10n/%.json,$(L10N_PO))
 else
@@ -359,7 +361,7 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
 
 $(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@echo "Checking for admin JS errors..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+   @$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src 
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
 
@@ -368,7 +370,7 @@ if ENABLE_DEBUG
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
@mkdir -p $(dir $@)
@echo "Checking for loleaflet JS errors..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src \
+   @$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
@touch $@
 
@@ -383,7 +385,7 @@ else
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@mkdir -p $(dir $@)
@echo "Checking for loleaflet JS errors..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src \
+   @$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config 
$(srcdir)/.eslintrc
@m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
@@ -396,11 +398,11 @@ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: 
$(LOLEAFLET_JS_SRC)
 
 $(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS)
@echo "Uglify loleaflet css files..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
+   @$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
 
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
@echo "Uglify global.js file..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs $< --output $@
+   @$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
 
 $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
@@ -411,7 +413,7 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
-DLOLEAFLET_LIBS_JS=$(subst 
$(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
-DLOLEAFLET_JS=$(builddir)/build/dist/loleaflet-src.js \
$(srcdir)/bundle.js.m4 > $(LOLEAFLET_PREFIX)/dist/bundle.js
-   NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
+   $(NODE) node_modules/uglify-js/bin/uglifyjs \
$(LOLEAFLET_PREFIX)/dist/bundle.js \
--output $@
 endif
@@ -448,7 +450,7 @@ Makefile: $(srcdir)/Makefile.in 
$(top_builddir)/config.status node_modules
 $(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css
@mkdir -p $(dir $@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
-   NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglifycss/uglifycss $< > $@ ; \
+   $(NODE) node_modules/uglifycss/uglifycss $< > $@ ; \
else \
ln -sf $(abs_srcdir)/$< $@ ; \
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-28 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7e83696158f7e21daf7d4ed8ba99a28cdcfd4e76
Author: Henry Castro 
AuthorDate: Thu May 28 11:27:32 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 28 21:48:51 2020 +0200

loleaflet: makefile: update Makefile rule

Change-Id: If52e0c1094e71cd52e665a0bbbdda2f4a9f0cd5f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95059
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1959b1204..00e77e662 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -439,8 +439,10 @@ node_modules: package.json archived-packages
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status node_modules
@case '$?' in \
-*node_modules*) \
- touch Makefile;; \
+*config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+*) \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@;; \
esac;
 
 $(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-27 Thread Andras Timar (via logerrit)

 loleaflet/Makefile.am |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 00471c82e5633a38441e2487cc0cf1b51353c94c
Author: Andras Timar 
AuthorDate: Wed May 27 14:20:43 2020 +0200
Commit: Andras Timar 
CommitDate: Wed May 27 18:47:25 2020 +0200

install the optional welcome text

Change-Id: Ic3096110cab7068d7963056fab1002db4fc8451e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94970
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b23ab1a10..8addfff8c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -48,6 +48,9 @@ endif
 LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
 LOLEAFLET_HTML_DST = $(patsubst 
$(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LOLEAFLET_HTML_SRC))
 
+LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
+LOLEAFLET_WELCOME_DST = $(patsubst 
$(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
+
 LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
 LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
@@ -414,7 +417,7 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
--output $@
 endif
 
-$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/global.js \
+$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) $(LOLEAFLET_WELCOME_DST) $(DIST_FOLDER)/bundle.css 
$(DIST_FOLDER)/global.js \
 \
$(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/bundle.js
@echo "Generating loleaflet.html..."
@@ -467,6 +470,14 @@ $(DIST_FOLDER)/%.html: $(srcdir)/html/%.html
`ln -sf $(abs_srcdir)/$< $@`; \
fi
 
+$(DIST_FOLDER)/welcome/%.html: $(srcdir)/welcome/%.html
+   @mkdir -p $(dir $@)
+   @if test -z '$(ENABLE_BROWSERSYNC)'; then \
+   `cp $< $@`; \
+   else \
+   `ln -sf $(abs_srcdir)/$< $@`; \
+   fi
+
 $(DIST_FOLDER)/src/%.js: $(srcdir)/src/%.js
@mkdir -p $(dir $@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-07 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54ac186ed595fd8064eceecfb6088e11b373f351
Author: Henry Castro 
AuthorDate: Wed Apr 29 08:14:16 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 7 18:25:14 2020 +0200

loleaflet: makefile: no built-in rules

It is not needed to build loleaflet

Change-Id: I2eb0ed999a0463b3f69e98a6a450961a7e6723d0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93168
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4bb2b1c84..f4f62f493 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,3 +1,4 @@
+MAKEFLAGS = --no-builtin-rules
 CTAGS = ctags
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-05-04 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am  |4 
 loleaflet/src/control/Control.Notebookbar.js   |   94 ---
 loleaflet/src/control/Control.NotebookbarCalc.js   |   52 +++
 loleaflet/src/control/Control.NotebookbarWriter.js |   99 +
 loleaflet/src/control/Control.UIManager.js |6 +
 5 files changed, 164 insertions(+), 91 deletions(-)

New commits:
commit b0e2bd990efda7c408d8ac4e76c15327b30a35f3
Author: Szymon Kłos 
AuthorDate: Fri May 1 12:19:29 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 4 08:54:32 2020 +0200

notebookbar: separate file for each app

Change-Id: If61ed762a3dd55c0cef7d58b7a3b1ddf8276cce3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93304
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 94caedb92..4bb2b1c84 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -282,6 +282,8 @@ LOLEAFLET_JS =\
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
src/control/Control.Notebookbar.js \
+   src/control/Control.NotebookbarWriter.js \
+   src/control/Control.NotebookbarCalc.js \
src/control/Control.NotebookbarBuilder.js \
src/control/Control.Layers.js \
src/control/Search.js \
@@ -552,6 +554,8 @@ pot:
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
src/control/Control.Notebookbar.js \
+   src/control/Control.NotebookbarWriter.js \
+   src/control/Control.NotebookbarCalc.js \
src/control/Control.NotebookbarBuilder.js \
src/control/Ruler.js \
src/control/Signing.js \
diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
index 1a1bc37c1..0fca7d1ca 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -5,9 +5,6 @@
 
 /* global $ */
 L.Control.Notebookbar = L.Control.extend({
-   options: {
-   docType: ''
-   },
 
onAdd: function (map) {
this.map = map;
@@ -39,68 +36,13 @@ L.Control.Notebookbar = L.Control.extend({
$('nav').prepend(tabs);
},
 
-   selectedTab: function(tabText) {
-   console.log(tabText);
-   switch (tabText) {
-   case 'HomeLabel':
-   this.loadTab(this.getHomeTab());
-   break;
-
-   case 'InsertLabel':
-   this.loadTab(this.getInsertTab());
-   break;
-
-   case 'LayoutLabel':
-   this.loadTab(this.getLayoutTab());
-   break;
-   
-   case 'ReferencesLabel':
-   this.loadTab(this.getReferencesTab());
-   break;
-
-   case 'TableLabel':
-   this.loadTab(this.getTableTab());
-   break;
-
-   case 'ReviewLabel':
-   this.loadTab(this.getReviewTab());
-   break;
-   }
+   selectedTab: function() {
+   // implement in child classes
},

getTabs: function() {
-   return [
-   {
-   'text': '~Home',
-   'id': '2',
-   'name': 'HomeLabel'
-   },
-   {
-   'text': '~Insert',
-   'id': '3',
-   'name': 'InsertLabel'
-   },
-   {
-   'text': '~Layout',
-   'id': '4',
-   'name': 'LayoutLabel'
-   },
-   {
-   'text': 'Reference~s',
-   'id': '5',
-   'name': 'ReferencesLabel'
-   },
-   {
-   'text': '~Review',
-   'id': '6',
-   'name': 'ReviewLabel'
-   },
-   {
-   'text': '~Table',
-   'id': '8',
-   'name': 'TableLabel'
-   }
-   ];
+   // implement in child classes
+   return [];
},
 
// required, called by builder, not needed in this container
@@ -153,32 +95,4 @@ L.Control.Notebookbar = L.Control.extend({
$(window).resize(handler);

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-05-01 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am   |2 ++
 loleaflet/src/control/Control.Notebookbar.js|   14 +-
 loleaflet/src/control/Control.NotebookbarBuilder.js |   17 +
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 7bdf49c33d11c3cecf3cae096cdd601e1cf3b09b
Author: Szymon Kłos 
AuthorDate: Wed Apr 22 11:29:31 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 1 11:54:25 2020 +0200

notebookbar: use builder to create

Change-Id: If8bbbaba66aba887587b8679f7a1ac9f5ccb4490
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93052
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 0551a1430..84dbb54b1 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -281,6 +281,7 @@ LOLEAFLET_JS =\
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
src/control/Control.Notebookbar.js \
+   src/control/Control.NotebookbarBuilder.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
@@ -550,6 +551,7 @@ pot:
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
src/control/Control.Notebookbar.js \
+   src/control/Control.NotebookbarBuilder.js \
src/control/Ruler.js \
src/control/Signing.js \
src/control/Toolbar.js \
diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
index 33084e62a..843439c82 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -3,7 +3,7 @@
  * L.Control.Notebookbar
  */
 
-/* global */
+/* global $ */
 L.Control.Notebookbar = L.Control.extend({
options: {
docType: ''
@@ -11,8 +11,20 @@ L.Control.Notebookbar = L.Control.extend({
 
onAdd: function (map) {
this.map = map;
+
+   var homeTab = JSON.parse(this.getHomeTab());
+   var builder = new L.control.notebookbarBuilder({mobileWizard: 
this, map: this.map});
+   builder.build($('#toolbar-wrapper').get(0), [homeTab]);
+   },
+
+   setTabs: function(tabs) {
+   $('nav').prepend(tabs);
},
 
+   getHomeTab: function() {
+   return '';
+   }
+
 });
 
 L.control.notebookbar = function (options) {
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
new file mode 100644
index 0..a07987c31
--- /dev/null
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -0,0 +1,17 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.NotebookbarBuilder
+ */
+
+/* global */
+L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
+
+   onAdd: function (map) {
+   this.map = map;
+   },
+
+});
+
+L.control.notebookbarBuilder = function (options) {
+   return new L.Control.NotebookbarBuilder(options);
+};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-29 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|2 ++
 loleaflet/src/control/Control.Notebookbar.js |   20 
 loleaflet/src/control/Control.StatusBar.js   |   17 -
 loleaflet/src/control/Control.Toolbar.js |   17 +
 loleaflet/src/control/Control.UIManager.js   |   18 --
 5 files changed, 51 insertions(+), 23 deletions(-)

New commits:
commit df19274705d3c9897b4e8679a0a2daf228c5d756
Author: Szymon Kłos 
AuthorDate: Tue Apr 21 14:10:38 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 29 09:49:52 2020 +0200

notebookbar: Create toolbars depending on settings

Change-Id: I66a03e9d8e9104b9f7868f24601525d502734e0e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93051
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2fc3a232c..0551a1430 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -280,6 +280,7 @@ LOLEAFLET_JS =\
src/control/Control.TopToolbar.js \
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
+   src/control/Control.Notebookbar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
@@ -548,6 +549,7 @@ pot:
src/control/Control.UserList.js \
src/control/Control.UIManager.js \
src/control/Control.DocumentNameInput.js \
+   src/control/Control.Notebookbar.js \
src/control/Ruler.js \
src/control/Signing.js \
src/control/Toolbar.js \
diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
new file mode 100644
index 0..33084e62a
--- /dev/null
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -0,0 +1,20 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.Notebookbar
+ */
+
+/* global */
+L.Control.Notebookbar = L.Control.extend({
+   options: {
+   docType: ''
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   },
+
+});
+
+L.control.notebookbar = function (options) {
+   return new L.Control.Notebookbar(options);
+};
diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
index dd12ec836..9bd0c8d53 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -239,23 +239,6 @@ L.Control.StatusBar = L.Control.extend({
w2ui['actionbar'].touchStarted = true;
});
 
-   this.map.on('search', function (e) {
-   var searchInput = L.DomUtil.get('search-input');
-   var toolbar = w2ui['actionbar'];
-   if (e.count === 0) {
-   toolbar.disable('searchprev');
-   toolbar.disable('searchnext');
-   toolbar.hide('cancelsearch');
-   L.DomUtil.addClass(searchInput, 
'search-not-found');
-   $('#findthis').addClass('search-not-found');
-   that.map.resetSelection();
-   setTimeout(function () {
-   
$('#findthis').removeClass('search-not-found');
-   L.DomUtil.removeClass(searchInput, 
'search-not-found');
-   }, 500);
-   }
-   });
-
this.map.on('zoomend', function () {
var zoomPercent = 100;
var zoomSelected = null;
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index bdfbbee9e..d1db7a681 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -987,6 +987,23 @@ function setupToolbar(e) {
entry.select();
});
 
+   map.on('search', function (e) {
+   var searchInput = L.DomUtil.get('search-input');
+   var toolbar = w2ui['actionbar'];
+   if (e.count === 0) {
+   toolbar.disable('searchprev');
+   toolbar.disable('searchnext');
+   toolbar.hide('cancelsearch');
+   L.DomUtil.addClass(searchInput, 'search-not-found');
+   $('#findthis').addClass('search-not-found');
+   map.resetSelection();
+   setTimeout(function () {
+   $('#findthis').removeClass('search-not-found');
+   L.DomUtil.removeClass(searchInput, 
'search-not-found');
+   }, 500);
+   }
+   });
+
map.on('hyperlinkclicked', function (e) {

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

2020-04-27 Thread Henry Castro (via logerrit)

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

New commits:
commit 8ad070c0e53483250f923006f038e69b5b50c62e
Author: Henry Castro 
AuthorDate: Mon Apr 27 11:20:10 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Apr 27 20:21:16 2020 +0200

loleaflet: fix when cleaning the dist folder

Change-Id: If4abbc0acbc15b99d65fe6db488ab300378ec663
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92983
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 517ca3e2b..2fc3a232c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -580,7 +580,7 @@ l10n: pot
 
 clean-local:
rm -rf node_modules
-   @rm -rf $(DIST_FOLDER)/dist
+   @rm -rf $(DIST_FOLDER)
@rm -rf $(builddir)/build/dist
@rm -f $(abs_srcdir)/jsconfig.json
@rm -f $(abs_srcdir)/admin/jsconfig.json
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-22 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am  |2 
 loleaflet/src/control/Control.DocumentNameInput.js |  109 +
 loleaflet/src/control/Control.Toolbar.js   |   88 
 loleaflet/src/control/Control.UIManager.js |1 
 4 files changed, 112 insertions(+), 88 deletions(-)

New commits:
commit 43f19fa57e8e8dbec9dd091d009f2dfec8f29759
Author: Szymon Kłos 
AuthorDate: Mon Apr 20 13:55:35 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 22 09:36:03 2020 +0200

Move DocumentNameInput to separate file

Change-Id: I20b5620269b46902a612d2b43346d3b02c3636cd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92622
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d38c7953a..517ca3e2b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -279,6 +279,7 @@ LOLEAFLET_JS =\
src/control/Control.SigningBar.js \
src/control/Control.TopToolbar.js \
src/control/Control.UIManager.js \
+   src/control/Control.DocumentNameInput.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
@@ -546,6 +547,7 @@ pot:
src/control/Control.TopToolbar.js \
src/control/Control.UserList.js \
src/control/Control.UIManager.js \
+   src/control/Control.DocumentNameInput.js \
src/control/Ruler.js \
src/control/Signing.js \
src/control/Toolbar.js \
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js 
b/loleaflet/src/control/Control.DocumentNameInput.js
new file mode 100644
index 0..3e2b20ec2
--- /dev/null
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -0,0 +1,109 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.DocumentNameInput
+ */
+
+/* global $ */
+L.Control.DocumentNameInput = L.Control.extend({
+
+   onAdd: function (map) {
+   this.map = map;
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('wopiprops', this.onWopiProps, this);
+   },
+
+   documentNameConfirm: function() {
+   var value = $('#document-name-input').val();
+   if (value !== null && value != '' && value != 
this.map['wopi'].BaseFileName) {
+   if (this.map['wopi'].UserCanRename && 
this.map['wopi'].SupportsRename) {
+   if (value.lastIndexOf('.') > 0) {
+   var fname = 
this.map['wopi'].BaseFileName;
+   var ext = 
fname.substr(fname.lastIndexOf('.')+1, fname.length);
+   // check format conversion
+   if (ext != 
value.substr(value.lastIndexOf('.')+1, value.length)) {
+   this.map.saveAs(value);
+   } else {
+   // same extension, just rename 
the file
+   // file name must be without 
the extension for rename
+   value = value.substr(0, 
value.lastIndexOf('.'));
+   
this.map.sendUnoCommand('.uno:Save');
+   this.map._RenameFile = value;
+   }
+   }
+   } else {
+   // saveAs for rename
+   this.map.saveAs(value);
+   }
+   }
+   this.map._onGotFocus();
+   },
+
+   documentNameCancel: function() {
+   $('#document-name-input').val(this.map['wopi'].BaseFileName);
+   this.map._onGotFocus();
+   },
+
+   onDocumentNameKeyPress: function(e) {
+   
$('#document-name-input').css('width',(($('#document-name-input').val().length 
+ 1) * 10) + 'px');
+   if (e.keyCode === 13) { // Enter key
+   this.documentNameConfirm();
+   } else if (e.keyCode === 27) { // Escape key
+   this.documentNameCancel();
+   }
+   },
+   
+   onDocumentNameFocus: function() {
+   // hide the caret in the main document
+   this.map._onLostFocus();
+   },
+
+   onDocLayerInit: function() {
+   if (window.mode.isMobile() || window.mode.isTablet()) {
+   if (!window.ThisIsAMobileApp)
+   $('#document-name-input').hide();
+   else
+   $('#document-name-input').show();
+   } else {
+   $('#document-name-input').show();
+   }
+

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

2020-04-21 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |  104 +-
 1 file changed, 54 insertions(+), 50 deletions(-)

New commits:
commit d8f8e12358a14f2efa905d963ee632de56299e94
Author: Henry Castro 
AuthorDate: Sun Apr 19 19:43:20 2020 -0400
Commit: Henry Castro 
CommitDate: Tue Apr 21 16:52:23 2020 +0200

android: parameterize the Dist folder

Now, It is possible to build lolealfet to assets
folder directly

Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 55d6af9c8..9702c2e65 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -2,10 +2,16 @@ CTAGS = ctags
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
 
+if ENABLE_ANDROIDAPP
+DIST_FOLDER = $(abs_top_srcdir)/android/lib/src/main/assets/dist
+else
+DIST_FOLDER = $(builddir)/dist
+endif
+
 if !ENABLE_MOBILEAPP
-L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
+L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(DIST_FOLDER)/l10n/%.json,$(L10N_PO))
 else
-L10N_IOS_ALL_JS = $(builddir)/dist/l10n-all.js
+L10N_IOS_ALL_JS = $(DIST_FOLDER)/l10n-all.js
 L10N_JSON = $(L10N_IOS_ALL_JS)
 
 $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find 
$(srcdir)/l10n -name '*.*') $(srcdir)/util/create-l10n-all-js.pl
@@ -21,28 +27,28 @@ endif
 
 JQUERY_LIGHTNESS_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
 JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png)
-JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst 
$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
+JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst 
$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
 
 JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images
 JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png)
-JQUERY_MINIFIED_DIST_IMAGES = $(patsubst 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_MINIFIED_IMAGES))
+JQUERY_MINIFIED_DIST_IMAGES = $(patsubst 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES))
 
 LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*')
-LOLEAFLET_IMAGES_DST = $(patsubst 
$(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC))
+LOLEAFLET_IMAGES_DST = $(patsubst 
$(srcdir)/%,$(DIST_FOLDER)/%,$(LOLEAFLET_IMAGES_SRC))
 LOLEAFLET_IMAGES_CUSTOM_SRC = $(shell find $(CUSTOM_ICONS_DIRECTORY) -name 
'*.*')
-LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst 
$(CUSTOM_ICONS_DIRECTORY)/%,$(builddir)/dist/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC))
+LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst 
$(CUSTOM_ICONS_DIRECTORY)/%,$(DIST_FOLDER)/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC))
 
 LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*')
 if !ENABLE_MOBILEAPP
-LOLEAFLET_L10N_DST =  $(patsubst 
$(srcdir)/l10n/%,$(builddir)/dist/l10n/%,$(LOLEAFLET_L10N_SRC))
+LOLEAFLET_L10N_DST =  $(patsubst 
$(srcdir)/l10n/%,$(DIST_FOLDER)/l10n/%,$(LOLEAFLET_L10N_SRC))
 endif
 
 LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
-LOLEAFLET_HTML_DST = $(patsubst 
$(srcdir)/html/%.html,$(builddir)/dist/%.html,$(LOLEAFLET_HTML_SRC))
+LOLEAFLET_HTML_DST = $(patsubst 
$(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LOLEAFLET_HTML_SRC))
 
 LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
-LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(builddir)/dist/admin/%,$(LOLEAFLET_ADMIN_SRC))
+LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
 
 define file_target
 $(1): $(2)
@@ -56,7 +62,7 @@ endef
 
 define file_targets
 $(foreach file,$(1),$(call file_target,\
-   $(builddir)/dist/$(notdir $(file)),\
+   $(DIST_FOLDER)/$(notdir $(file)),\
$(file)))
 endef
 
@@ -120,7 +126,7 @@ LOLEAFLET_CSS =\
$(srcdir)/css/vex.css \
$(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
 
-LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir 
$(file)))
+LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(DIST_FOLDER)/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file
 
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
@@ -150,10 +156,10 @@ LOLEAFLET_LIBS_JS +=\
w2ui-1.5.rc1.js
 
 NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
-NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
+NODE_MODULES_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(NODE_MODULES_JS))
 
 LOLEAFLET_LIBS_JS_SRC = $(patsubst %.js,$(srcdir)/js/%.js,$(LOLEAFLET_LIBS_JS))
-LOLEAFLET_LIBS_JS_DST = $(patsubst

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

2020-04-21 Thread Jan Holesovsky (via logerrit)

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

New commits:
commit e49e394ae50e71f01ceab8e8dc78c5cd0281cf9e
Author: Jan Holesovsky 
AuthorDate: Tue Apr 21 14:20:55 2020 +0200
Commit: Henry Castro 
CommitDate: Tue Apr 21 14:41:46 2020 +0200

android: Copying drawer_header.png is not needed any more.

Change-Id: I4bf707ac1e04a62122d3e999602e00815f8db758
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92632
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cb2c5be31..55d6af9c8 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -337,7 +337,6 @@ if ENABLE_ANDROIDAPP
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
@if test -d "$(APP_BRANDING_DIR)/android" ; then for I in `cd 
"$(APP_BRANDING_DIR)/android" && find . -type f` ; do mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/res/`dirname $$I` ; cp -a 
"$(APP_BRANDING_DIR)/android/$$I" 
"$(abs_top_srcdir)/android/app/src/main/res/$$I" ; done ; fi
@if test -d "$(APP_BRANDING_DIR)/online-theme" ; then mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions ; cp -a 
"$(APP_BRANDING_DIR)/online-theme" 
"$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions/online" 
; fi
-   @if test ! -e 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ; 
then cp -a 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header.png" 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ; 
fi
@echo
@echo "Copied JS, HTML and CSS to the Android project 
(android/lib/src/main/assets/dist)."
@echo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-20 Thread Henry Castro (via logerrit)

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

New commits:
commit 15fe4b8dca1b377b29ced19667b5132e4e3b434e
Author: Henry Castro 
AuthorDate: Mon Apr 20 14:32:53 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Apr 20 22:58:34 2020 +0200

android: fix "AAPT : error: resource drawable/writer not found."

Adding an empty image using the command "touch", generate a weird error
when merging resources:

* What went wrong:
Execution failed for task ':app:processDebugResources'.
> A failure occurred while executing
com.android.build.gradle.internal.tasks.Workers$ActionFacade
   > Android resource linking failed
android/app/src/main/res/layout/activity_document_browser.xml:163:
AAPT: error: resource drawable/writer 
(akaorg.libreoffice.androidapp.debug:drawable/writer) not found.

android/app/src/main/res/layout/activity_document_browser.xml:229:
AAPT: error: resource drawable/calc 
(akaorg.libreoffice.androidapp.debug:drawable/calc) not found.

android/sid/android/app/src/main/res/layout/file_explorer_grid_item.xml:49:
AAPT: error: resource drawable/ic_more_vert_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_more_vert_black_24dp) not 
found.

android/app/src/main/res/layout/file_list_item.xml:58:
AAPT: error: resource drawable/ic_more_vert_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_more_vert_black_24dp) not 
found.


android/sid/android/app/src/main/res/layout/fragment_directory_browser.xml:13:
AAPT: error: resource drawable/ic_menu_back
(aka org.libreoffice.androidapp.debug:drawable/ic_menu_back) not found.

android/sid/android/app/src/main/res/menu/view_menu.xml:5:
AAPT: error: resource drawable/ic_folder_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_folder_black_24dp) not 
found.

Change-Id: I99b0857941687846e90ad53f30cac6a7ef83beaa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92594
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3554ee1d3..cb2c5be31 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -338,7 +338,6 @@ if ENABLE_ANDROIDAPP
@if test -d "$(APP_BRANDING_DIR)/android" ; then for I in `cd 
"$(APP_BRANDING_DIR)/android" && find . -type f` ; do mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/res/`dirname $$I` ; cp -a 
"$(APP_BRANDING_DIR)/android/$$I" 
"$(abs_top_srcdir)/android/app/src/main/res/$$I" ; done ; fi
@if test -d "$(APP_BRANDING_DIR)/online-theme" ; then mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions ; cp -a 
"$(APP_BRANDING_DIR)/online-theme" 
"$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions/online" 
; fi
@if test ! -e 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ; 
then cp -a 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header.png" 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ; 
fi
-   @touch 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/ic_launcher_brand.xml" # 
to avoid problems with a missing resource in the non-branded builds
@echo
@echo "Copied JS, HTML and CSS to the Android project 
(android/lib/src/main/assets/dist)."
@echo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-17 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|2 
 loleaflet/src/control/Control.StatusBar.js   |   19 
 loleaflet/src/control/Control.Toolbar.js |   43 --
 loleaflet/src/control/Control.UIManager.js   |  110 +++
 loleaflet/src/layer/tile/CalcTileLayer.js|   38 -
 loleaflet/src/layer/tile/ImpressTileLayer.js |   37 -
 loleaflet/src/layer/tile/WriterTileLayer.js  |   14 ---
 loleaflet/src/main.js|   24 +
 loleaflet/src/map/Map.js |6 +
 9 files changed, 136 insertions(+), 157 deletions(-)

New commits:
commit 75e11420d51e3f53491a10f9933503c45fac19d6
Author: Szymon Kłos 
AuthorDate: Thu Apr 16 18:21:44 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Apr 17 12:12:13 2020 +0200

Introduce UIManager

Change-Id: I944622a352aae7951f3e69286bb163645fa23276
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92405
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 6c10bc441..87286367f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -272,6 +272,7 @@ LOLEAFLET_JS =\
src/control/Control.PresentationBar.js \
src/control/Control.SigningBar.js \
src/control/Control.TopToolbar.js \
+   src/control/Control.UIManager.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
@@ -548,6 +549,7 @@ pot:
src/control/Control.Toolbar.js \
src/control/Control.TopToolbar.js \
src/control/Control.UserList.js \
+   src/control/Control.UIManager.js \
src/control/Ruler.js \
src/control/Signing.js \
src/control/Toolbar.js \
diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
index ed5eb0353..2f1a7a44f 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -3,7 +3,7 @@
  * L.Control.StatusBar
  */
 
-/* global $ w2ui w2utils _ _UNO */
+/* global $ w2ui _ _UNO */
 L.Control.StatusBar = L.Control.extend({
 
initialize: function () {
@@ -11,10 +11,10 @@ L.Control.StatusBar = L.Control.extend({
 
onAdd: function (map) {
this.map = map;
-
map.on('doclayerinit', this.onDocLayerInit, this);
map.on('commandvalues', this.onCommandValues, this);
map.on('commandstatechanged', this.onCommandStateChanged, this);
+   this.create();
},
 
hideTooltip: function(toolbar, id) {
@@ -221,6 +221,8 @@ L.Control.StatusBar = L.Control.extend({
window.setupSearchInput();
}
});
+
+   toolbar.show();
}
 
toolbar.bind('touchstart', function() {
@@ -244,19 +246,6 @@ L.Control.StatusBar = L.Control.extend({
}
});
 
-   if (!window.mode.isMobile()) {  
-   this.map.on('showbusy', function(e) {
-   w2utils.lock(w2ui['actionbar'].box, e.label, 
true);
-   });
-   
-   this.map.on('hidebusy', function() {
-   // If locked, unlock
-   if (w2ui['actionbar'].box.firstChild.className 
=== 'w2ui-lock') {
-   w2utils.unlock(w2ui['actionbar'].box);
-   }
-   });
-   }
-
this.map.on('zoomend', function () {
var zoomPercent = 100;
var zoomSelected = null;
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 005fbd21c..ece25efcb 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -9,15 +9,6 @@
 
 var map;
 
-function resizeToolbar() {
-   if ($(window).width() !== map.getSize().x) {
-   var toolbarUp = w2ui['editbar'];
-   var statusbar = w2ui['actionbar'];
-   toolbarUp.resize();
-   statusbar.resize();
-   }
-}
-
 function _cancelSearch() {
var toolbar = window.mode.isMobile() ? w2ui['searchbar'] : 
w2ui['actionbar'];
var searchInput = L.DomUtil.get('search-input');
@@ -590,22 +581,6 @@ function hideTooltip(toolbar, id) {
}
 }
 
-function createToolbar() {
-
-   if (window.mode.isMobile()) {
-   $('#toolbar-search').hide();
-   $('#mobile-edit-button').show();
-   } else {
-   $('#toolbar-down').show();
-   initNormalToolbar();
-   }
-}
-
-function initNormalToolbar() {
-

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.PresentationBar.js |  156 +++
 loleaflet/src/control/Control.Toolbar.js |  100 --
 loleaflet/src/layer/tile/ImpressTileLayer.js |8 -
 4 files changed, 158 insertions(+), 107 deletions(-)

New commits:
commit 2f57f0c34eacbba7bd897713a74e1ccc73c095f4
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 15:25:22 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:51 2020 +0200

Move presentation toolbar to separate file

Change-Id: I47faf807bbbd79e27c9eb5156fc24dc4bc053aab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92272
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2a6355431..385bb96a6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -269,6 +269,7 @@ LOLEAFLET_JS =\
src/control/Control.UserList.js \
src/control/Control.FormulaBar.js \
src/control/Control.SheetsBar.js \
+   src/control/Control.PresentationBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.PresentationBar.js 
b/loleaflet/src/control/Control.PresentationBar.js
new file mode 100644
index 0..9cf159bd5
--- /dev/null
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -0,0 +1,156 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.PresentationBar
+ */
+
+/* global $ w2ui _ _UNO vex */
+L.Control.PresentationBar = L.Control.extend({
+   options: {
+   shownavigation: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('wopiprops', this.onWopiProps, this);
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#presentation-toolbar');
+   toolbar.w2toolbar({
+   name: 'presentation-toolbar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'html',  id: 'left'},
+   {type: 'button',  id: 'presentation', img: 
'presentation', hidden:true, hint: _('Fullscreen presentation')},
+   {type: 'break', id: 'presentationbreak', 
hidden:true},
+   {type: 'button',  id: 'insertpage', img: 
'insertpage', hint: _UNO('.uno:TaskPaneInsertPage', 'presentation')},
+   {type: 'button',  id: 'duplicatepage', img: 
'duplicatepage', hint: _UNO('.uno:DuplicateSlide', 'presentation')},
+   {type: 'button',  id: 'deletepage', img: 
'deletepage', hint: _UNO('.uno:DeleteSlide', 'presentation')},
+   {type: 'html',  id: 'right'}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   }
+   });
+   toolbar.bind('touchstart', function() {
+   w2ui['presentation-toolbar'].touchStarted = true;
+   });
+   },
+
+   onDelete: function(e) {
+   if (e !== false) {
+   this.map.deletePage();
+   }
+   },
+
+   onClick: function(e, id, item) {
+   if ('presentation-toolbar' in w2ui && 
w2ui['presentation-toolbar'].get(id) !== null) {
+   var toolbar = w2ui['presentation-toolbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if ((id === 'presentation') && this.map.getDocType() === 
'presentation') {
+   this.map.fire('fullscreen');
+   }
+   else if (id === 'insertpage') {
+   this.map.insertPage();
+   }
+   else if (id === 'duplicatepage') {
+   this.map.duplicatePage();
+   }
+   else if (id === 'deletepage') {
+   vex.dialog.confirm({
+   message: _('Are you sure you want to delete 
this

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am  |1 
 loleaflet/src/control/Control.SheetsBar.js |  123 +
 loleaflet/src/control/Control.Toolbar.js   |   74 -
 loleaflet/src/layer/tile/CalcTileLayer.js  |   22 -
 4 files changed, 127 insertions(+), 93 deletions(-)

New commits:
commit fe2743233fe644dfb7ea7e3e78f2ae4274b2ada7
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 14:15:22 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:35 2020 +0200

Move sheets bar to separate file

Change-Id: Id2cdfdd50e178e4de54a41fa1926e94def9a43f5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92271
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c5693d351..2a6355431 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -268,6 +268,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileBottomBar.js \
src/control/Control.UserList.js \
src/control/Control.FormulaBar.js \
+   src/control/Control.SheetsBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.SheetsBar.js 
b/loleaflet/src/control/Control.SheetsBar.js
new file mode 100644
index 0..1a9696a09
--- /dev/null
+++ b/loleaflet/src/control/Control.SheetsBar.js
@@ -0,0 +1,123 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SheetsBar
+ */
+
+/* global $ w2ui _ */
+L.Control.SheetsBar = L.Control.extend({
+   options: {
+   shownavigation: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#spreadsheet-toolbar');
+   toolbar.w2toolbar({
+   name: 'spreadsheet-toolbar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'firstrecord',  img: 'firstrecord', hint: 
_('First sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'prevrecord',  img: 'prevrecord', hint: 
_('Previous sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'nextrecord',  img: 'nextrecord', hint: 
_('Next sheet')},
+   {type: 'button',  hidden: 
!this.options.shownavigation, id: 'lastrecord',  img: 'lastrecord', hint: 
_('Last sheet')},
+   {type: 'button',  id: 'insertsheet', img: 
'insertsheet', hint: _('Insert sheet')}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   }
+   });
+   toolbar.bind('touchstart', function(e) {
+   w2ui['spreadsheet-toolbar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+   toolbar.show();
+   },
+
+   onClick: function(e, id, item) {
+   if ('spreadsheet-toolbar' in w2ui && 
w2ui['spreadsheet-toolbar'].get(id) !== null) {
+   var toolbar = w2ui['spreadsheet-toolbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (id === 'insertsheet') {
+   var nPos = 
$('#spreadsheet-tab-scroll')[0].childElementCount;
+   this.map.insertPage(nPos);
+   this.map.insertPage.scrollToEnd = true;
+   }
+   else if (id === 'firstrecord') {
+   $('#spreadsheet-tab-scroll').scrollLeft(0);
+   }
+   // TODO: We should get visible tab's width instead of 60px
+   else if (id === 'nextrecord') {
+   
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft()
 + 60);

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am   |1 
 loleaflet/src/control/Control.FormulaBar.js |  185 
 loleaflet/src/control/Control.Toolbar.js|  133 
 loleaflet/src/layer/tile/CalcTileLayer.js   |   33 
 4 files changed, 189 insertions(+), 163 deletions(-)

New commits:
commit cca7a440093237af0bdcb87d44a77f383324c4bc
Author: Szymon Kłos 
AuthorDate: Wed Apr 15 13:38:46 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 16:52:12 2020 +0200

Move formula bar to separate file

Change-Id: If380e8bc8091151872a728cc632313aa3f4cfda1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92269
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 0cb94a244..c5693d351 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -267,6 +267,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileTopBar.js \
src/control/Control.MobileBottomBar.js \
src/control/Control.UserList.js \
+   src/control/Control.FormulaBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.FormulaBar.js 
b/loleaflet/src/control/Control.FormulaBar.js
new file mode 100644
index 0..e90e3f141
--- /dev/null
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -0,0 +1,185 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.FormulaBar
+ */
+
+/* global $ w2ui _ */
+L.Control.FormulaBar = L.Control.extend({
+   options: {
+   showfunctionwizard: true
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+
+   map.on('celladdress', function (e) {
+   if (document.activeElement !== 
L.DomUtil.get('addressInput')) {
+   // if the user is not editing the address field
+   L.DomUtil.get('addressInput').value = e.address;
+   }
+   });
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#formulabar');
+   toolbar.w2toolbar({
+   name: 'formulabar',
+   tooltip: 'bottom',
+   hidden: true,
+   items: [
+   {type: 'html',  id: 'left'},
+   {type: 'html', id: 'address', html: ''},
+   {type: 'break', hidden: 
!this.options.showfunctionwizard},
+   {type: 'button', hidden: 
!this.options.showfunctionwizard, id: 'functiondialog', img: 'functiondialog', 
hint: _('Function Wizard'), uno: '.uno:FunctionDialog'},
+   {type: 'html', id: 'formula', html: ''}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target);
+   window.hideTooltip(this, e.target);
+   },
+   onRefresh: function() {
+   $('#addressInput').off('keyup', 
this.onAddressInput, this).on('keyup', this.onAddressInput, this);
+   }
+   });
+   toolbar.bind('touchstart', function(e) {
+   w2ui['formulabar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+
+   $(w2ui.formulabar.box).find('.w2ui-scroll-left, 
.w2ui-scroll-right').hide();
+   w2ui.formulabar.on('resize', function(target, e) {
+   e.isCancelled = true;
+   });
+   },
+
+   onClick: function(e, id, item) {
+   if ('formulabar' in w2ui && w2ui['formulabar'].get(id) !== 
null) {
+   var toolbar = w2ui['formulabar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (item.uno) {
+   if (item.unosheet && this.map.getDocType() === 
'spreadsheet') {
+

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.MobileBottomBar.js |  137 +++
 loleaflet/src/layer/tile/CalcTileLayer.js|   53 
 loleaflet/src/layer/tile/ImpressTileLayer.js |   48 
 loleaflet/src/layer/tile/WriterTileLayer.js  |   55 -
 5 files changed, 144 insertions(+), 150 deletions(-)

New commits:
commit a4201e929e9d75ff746492f57e619798a31e8b40
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 19:44:21 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 15:27:09 2020 +0200

Move bottom mobile toolbar to separate file

Change-Id: I32e8fe251fcabd5d1c5af19cd7a72f60250c2851
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92159
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 303e53d6b..a57e9ebd4 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -265,6 +265,7 @@ LOLEAFLET_JS =\
src/control/Control.StatusBar.js \
src/control/Control.SearchBar.js \
src/control/Control.MobileTopBar.js \
+   src/control/Control.MobileBottomBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.MobileBottomBar.js 
b/loleaflet/src/control/Control.MobileBottomBar.js
new file mode 100644
index 0..078e8d880
--- /dev/null
+++ b/loleaflet/src/control/Control.MobileBottomBar.js
@@ -0,0 +1,137 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.MobileBottomBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.MobileBottomBar = L.Control.extend({
+
+   options: {
+   doctype: 'text'
+   },
+
+   initialize: function (docType) {
+   L.setOptions(this, {docType: docType});
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+   },
+
+   getToolItems: function(docType) {
+   if (docType == 'text') {
+   return [
+   {type: 'button',  id: 'showsearchbar',  img: 
'search', hint: _('Show the search bar')},
+   {type: 'break'},
+   {type: 'button',  id: 'bold',  img: 'bold', 
hint: _UNO('.uno:Bold'), uno: 'Bold'},
+   {type: 'button',  id: 'italic', img: 'italic', 
hint: _UNO('.uno:Italic'), uno: 'Italic'},
+   {type: 'button',  id: 'underline',  img: 
'underline', hint: _UNO('.uno:Underline'), uno: 'Underline'},
+   {type: 'button',  id: 'strikeout', img: 
'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'},
+   {type: 'break'},
+   {type: 'button',  id: 'fontcolor', img: 
'textcolor', hint: _UNO('.uno:FontColor')},
+   {type: 'button',  id: 'backcolor', img: 
'backcolor', hint: _UNO('.uno:BackgroundColor')},
+   {type: 'button',  id: 'leftpara',  img: 
'alignleft', hint: _UNO('.uno:LeftPara', '', true),
+   uno: {textCommand: 'LeftPara', 
objectCommand: 'ObjectAlignLeft'},
+   unosheet: 'AlignLeft', disabled: true},
+   {type: 'button',  id: 'centerpara',  img: 
'alignhorizontal', hint: _UNO('.uno:CenterPara', '', true),
+   uno: {textCommand: 'CenterPara', 
objectCommand: 'AlignCenter'},
+   unosheet: 'AlignHorizontalCenter', 
disabled: true},
+   {type: 'button',  id: 'rightpara',  img: 
'alignright', hint: _UNO('.uno:RightPara', '', true),
+   uno: {textCommand: 'RightPara', 
objectCommand: 'ObjectAlignRight'},
+   unosheet: 'AlignRight', disabled: true},
+   {type: 'button',  id: 'justifypara',  img: 
'alignblock', hint: _UNO('.uno:JustifyPara', '', true), uno: 'JustifyPara', 
unosheet: '', disabled: true},
+   {type: 'break', id: 'breakspacing'},
+   {type: 'button',  id: 'defaultnumbering',  img: 
'numbering', hint: _UNO('.uno:DefaultNumbering', '', true),uno: 
'DefaultNumbering', disabled: true},
+   {type: 'button',  id: 'defaultbullet',  img: 
'bullet', hint: _UNO('.uno:DefaultBullet', '', true), uno: 'DefaultBullet', 
disabled: true},
+   {type: 'break', id: 'breakbullet', hidden: 
true},
+   {type: 'button',  id: 'incrementindent',  img: 
'incrementindent', hint: _UNO('.uno:IncrementIndent', '', true), uno: 
'IncrementIndent', disabled: true},
+   {type: 'button',  id: 'decrementindent',

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.JSDialogBuilder.js |4 
 loleaflet/src/control/Control.MobileTopBar.js|  216 +++
 loleaflet/src/control/Control.StatusBar.js   |   21 --
 loleaflet/src/control/Control.Toolbar.js |   44 
 loleaflet/src/layer/tile/CalcTileLayer.js|   39 
 loleaflet/src/layer/tile/ImpressTileLayer.js |   39 
 loleaflet/src/layer/tile/WriterTileLayer.js  |   41 
 8 files changed, 227 insertions(+), 178 deletions(-)

New commits:
commit 651a7bba1c6ce68bfbd54f7cc8c9622b4d036af0
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 17:36:40 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:43:09 2020 +0200

Move mobile top bar to separate file

Change-Id: I26fc5be1b73b4ff68be00c21a6691c7712d08c1e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92158
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cef67ce69..303e53d6b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -264,6 +264,7 @@ LOLEAFLET_JS =\
src/control/Control.Scale.js \
src/control/Control.StatusBar.js \
src/control/Control.SearchBar.js \
+   src/control/Control.MobileTopBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 8727e065c..7ff08ce86 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -4,7 +4,7 @@
  * from the JSON description provided by the server.
  */
 
-/* global $ _ _UNO */
+/* global $ w2ui _ _UNO */
 
 L.Control.JSDialogBuilder = L.Control.extend({
 
@@ -1570,7 +1570,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (builder.wizard) {
$(menuEntry).click(function() {
if (window.insertionMobileWizard)
-   window.onClick(null, 
'insertion_mobile_wizard');
+   
w2ui['actionbar'].click('insertion_mobile_wizard');
else if (window.mobileMenuWizard)
$('#main-menu-state').click();
else if (window.contextMenuWizard) {
diff --git a/loleaflet/src/control/Control.MobileTopBar.js 
b/loleaflet/src/control/Control.MobileTopBar.js
new file mode 100644
index 0..2d4a917f3
--- /dev/null
+++ b/loleaflet/src/control/Control.MobileTopBar.js
@@ -0,0 +1,216 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SearchBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.MobileTopBar = L.Control.extend({
+
+   options: {
+   doctype: 'text'
+   },
+
+   initialize: function (docType) {
+   L.setOptions(this, {docType: docType});
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+
+   map.on('updatepermission', this.onUpdatePermission, this);
+   },
+
+   getToolItems: function(docType) {
+   if (docType == 'text') {
+   return [
+   {type: 'button',  id: 'closemobile',  img: 
'closemobile'},
+   {type: 'spacer'},
+   {type: 'button',  id: 'undo',  img: 'undo', 
hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true},
+   {type: 'button',  id: 'redo',  img: 'redo', 
hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true},
+   {type: 'button',  id: 'mobile_wizard', img: 
'mobile_wizard', disabled: true},
+   {type: 'button',  id: 
'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true},
+   {type: 'button',  id: 'insertcomment', img: 
'insertcomment', disabled: true},
+   {type: 'button',  id: 'fullscreen', img: 
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
+   {type: 'drop', id: 'userlist', img: 'users', 
html: '' +
+   '' +
+   '' +
+   '' +
+   '' + _('Always follow the editor') 
+ '' +
+   '' +
+   '' +
+   '' + _('Current') 
+ ' - ' +
+   ''
+   },
+   ];
+   } else if (docType == 'spreadsheet') {
+   return [
+   {type: 'button',  id: 'closemobile',  img:

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am|1 
 loleaflet/src/control/Control.SearchBar.js   |  111 +++
 loleaflet/src/control/Control.Toolbar.js |   17 
 loleaflet/src/layer/tile/CalcTileLayer.js|   40 -
 loleaflet/src/layer/tile/ImpressTileLayer.js |   40 -
 loleaflet/src/layer/tile/WriterTileLayer.js  |   40 -
 6 files changed, 115 insertions(+), 134 deletions(-)

New commits:
commit b0be9c7b35049c6ca94702392f59322f3f49e2a0
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 15:19:56 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:19:19 2020 +0200

Move SearchBar to separate file

Change-Id: I6db64d35f40f3a762f50df010ead9395a873fb20
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92037
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 89d4952d2..cef67ce69 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -263,6 +263,7 @@ LOLEAFLET_JS =\
src/control/Control.MobileSlide.js \
src/control/Control.Scale.js \
src/control/Control.StatusBar.js \
+   src/control/Control.SearchBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.SearchBar.js 
b/loleaflet/src/control/Control.SearchBar.js
new file mode 100644
index 0..d6714002a
--- /dev/null
+++ b/loleaflet/src/control/Control.SearchBar.js
@@ -0,0 +1,111 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.SearchBar
+ */
+
+/* global $ w2ui _ _UNO */
+L.Control.SearchBar = L.Control.extend({
+
+   onAdd: function (map) {
+   this.map = map;
+   this.create();
+   },
+
+   create: function() {
+   var that = this;
+   var toolbar = $('#toolbar-search');
+   toolbar.w2toolbar({
+   name: 'searchbar',
+   tooltip: 'top',
+   items: [
+   {
+   type: 'html', id: 'search',
+   html: '' +
+   'Search:' +
+   '' +
+   ''
+   },
+   {type: 'button', id: 'searchprev', img: 'prev', 
hint: _UNO('.uno:UpSearch'), disabled: true},
+   {type: 'button', id: 'searchnext', img: 'next', 
hint: _UNO('.uno:DownSearch'), disabled: true},
+   {type: 'button', id: 'cancelsearch', img: 
'cancel', hint: _('Clear the search field'), hidden: true},
+   {type: 'html', id: 'left'},
+   {type: 'button', id: 'hidesearchbar', img: 
'unfold', hint: _('Hide the search bar')}
+   ],
+   onClick: function (e) {
+   that.onClick(e, e.target, e.item, e.subItem);
+   },
+   onRefresh: function () {
+   window.setupSearchInput();
+   }
+   });
+
+   toolbar.bind('touchstart', function(e) {
+   w2ui['searchbar'].touchStarted = true;
+   var touchEvent = e.originalEvent;
+   if (touchEvent && touchEvent.touches.length > 1) {
+   L.DomEvent.preventDefault(e);
+   }
+   });
+
+   $(w2ui.searchbar.box).find('.w2ui-scroll-left, 
.w2ui-scroll-right').hide();
+   w2ui.searchbar.on('resize', function(target, e) {
+   e.isCancelled = true;
+   });
+   },
+
+   onClick: function(e, id, item) {
+   if (w2ui['searchbar'].get(id) !== null) {
+   var toolbar = w2ui['searchbar'];
+   item = toolbar.get(id);
+   }
+
+   // In the iOS app we don't want clicking on the toolbar to pop 
up the keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 
'zoomout' && id !== 'mobile_wizard' && id !== 'insertion_mobile_wizard') {
+   this.map.focus(this.map.canAcceptKeyboardInput()); // 
Maintain same keyboard state.
+   }
+
+   if (item.disabled) {
+   return;
+   }
+
+   if (id === 'searchprev') {
+   this.map.search(L.DomUtil.get('search-input').value, 
true);
+   }
+   else if (id === 'searchnext') {
+   this.map.search(L.DomUtil.get('search-input').value);
+   }
+   else if (id === 'cancelsearch') {
+

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2020-04-15 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am  |1 
 loleaflet/src/control/Control.StatusBar.js |  721 +
 loleaflet/src/control/Control.Toolbar.js   |  571 --
 loleaflet/src/main.js  |3 
 4 files changed, 726 insertions(+), 570 deletions(-)

New commits:
commit 615f5212bf68240c41ebd21fe051b97d6d171d4c
Author: Szymon Kłos 
AuthorDate: Fri Apr 10 11:29:52 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 15 11:03:21 2020 +0200

Move statusbar code to separate file

Change-Id: Ia4940b1725bbc4326dfeb520a6bcb6423b9a25b9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92036
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1422de467..89d4952d2 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -262,6 +262,7 @@ LOLEAFLET_JS =\
src/control/Control.Attribution.js \
src/control/Control.MobileSlide.js \
src/control/Control.Scale.js \
+   src/control/Control.StatusBar.js \
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
new file mode 100644
index 0..a46ab6604
--- /dev/null
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -0,0 +1,721 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.Control.StatusBar
+ */
+
+/* global $ w2ui w2utils _ _UNO */
+L.Control.StatusBar = L.Control.extend({
+   options: {
+   userPopupTimeout: null,
+   userJoinedPopupMessage: '' + _('%user has joined') + 
'',
+   userLeftPopupMessage: '' + _('%user has left') + '',
+   nUsers: undefined,
+   oneUser: undefined,
+   noUser: undefined
+   },
+
+   initialize: function () {
+   },
+
+   onAdd: function (map) {
+   this.map = map;
+
+   map.on('doclayerinit', this.onDocLayerInit, this);
+   map.on('addview', this.onAddView, this);
+   map.on('removeview', this.onRemoveView, this);
+   map.on('commandvalues', this.onCommandValues, this);
+   map.on('commandstatechanged', this.onCommandStateChanged, this);
+   map.on('deselectuser', this.deselectUser, this);
+   map.on('updatepermission', this.onUpdatePermission, this);
+
+   },
+
+   hideTooltip: function(toolbar, id) {
+   if (toolbar.touchStarted) {
+   setTimeout(function() {
+   toolbar.tooltipHide(id, {});
+   }, 5000);
+   toolbar.touchStarted = false;
+   }
+   },
+
+   updateToolbarItem: function(toolbar, id, html) {
+   var item = toolbar.get(id);
+   if (item) {
+   item.html = html;
+   }
+   },
+
+   localizeStateTableCell: function(text) {
+   var stateArray = text.split(';');
+   var stateArrayLength = stateArray.length;
+   var localizedText = '';
+   for (var i = 0; i < stateArrayLength; i++) {
+   var labelValuePair = stateArray[i].split(':');
+   localizedText += _(labelValuePair[0].trim()) + ':' + 
labelValuePair[1];
+   if (stateArrayLength > 1 && i < stateArrayLength - 1) {
+   localizedText += '; ';
+   }
+   }
+   return localizedText;
+   },
+
+   toLocalePattern: function(pattern, regex, text, sub1, sub2) {
+   var matches = new RegExp(regex, 'g').exec(text);
+   if (matches) {
+   text = pattern.toLocaleString().replace(sub1, 
parseInt(matches[1].replace(',','')).toLocaleString(String.locale)).replace(sub2,
 parseInt(matches[2].replace(',','')).toLocaleString(String.locale));
+   }
+   return text;
+   },
+
+   escapeHtml: function(input) {
+   return $('').text(input).html();
+   },
+
+   getUserItem: function(viewId, userName, extraInfo, color) {
+   var html = '' +
+'';
+   if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
+   html += '';
+   } else {
+   html += '';
+   }
+   
+   // TODO: Add mail and other links as sub-menu.
+   html += '' +
+'' + 
userName + '' +
+   '';
+   
+   return html;
+   },
+
+   _updateVisibilityForToolbar: function(toolbar) {
+   if (!toolbar)
+   return;
+   
+   var toShow = [];
+   var toHide

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

2020-01-06 Thread Henry Castro (via logerrit)

 loleaflet/Makefile.am |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1dda92109fe17b291a3a650646a19f1af49babe7
Author: Henry Castro 
AuthorDate: Mon Dec 23 13:59:16 2019 -0400
Commit: Henry Castro 
CommitDate: Mon Jan 6 18:48:15 2020 +0100

makefile: generate an index (ctag) file for the JavaScript language

Change-Id: I495c7665786a47cfb007260368084a01c4163ea7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/85766
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 30ed1741d..edc6551aa 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,3 +1,4 @@
+CTAGS = ctags
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
 
@@ -404,3 +405,6 @@ load-test: spec/data/load-test
do \
node_modules/.bin/mocha spec/headlessLoadTest.js > 
load_test_out/$$i.out 2>&1 & \
done;
+
+ctags:
+   @$(CTAGS) --language-force=JavaScript $(LOLEAFLET_JS_SRC) 
$(srcdir)/js/global.js
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-03 Thread Jan Holesovsky (via logerrit)

 loleaflet/Makefile.am |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 37b5d29fc139ded20e89535c54218b50c2c87312
Author: Jan Holesovsky 
AuthorDate: Fri Jan 3 11:03:32 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Jan 3 11:07:54 2020 +0100

android: Copy the online widget theme too if available.

Change-Id: If9fd23e24bd28897f1645c043678b44f86d5b2e4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86163
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 410e7453e..30ed1741d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -160,12 +160,14 @@ build-loleaflet: | $(LOLEAFLET_L10N_DST) \
$(builddir)/dist/loleaflet.html
@echo "build loleaflet completed"
 if ENABLE_ANDROIDAPP
-   @rm -rf $(abs_top_srcdir)/android/lib/src/main/assets/dist
+   @rm -rf $(abs_top_srcdir)/android/lib/src/main/assets
+   @mkdir -p $(abs_top_srcdir)/android/lib/src/main/assets
@cp -a $(builddir)/dist $(abs_top_srcdir)/android/lib/src/main/assets/
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/ ; else touch 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/branding.css ; fi
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)"/images/*.svg 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
@if test -d "$(APP_BRANDING_DIR)/android" ; then for I in `cd 
"$(APP_BRANDING_DIR)/android" && find . -type f` ; do mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/res/`dirname $$I` ; cp -a 
"$(APP_BRANDING_DIR)/android/$$I" 
"$(abs_top_srcdir)/android/app/src/main/res/$$I" ; done ; fi
+   @if test -d "$(APP_BRANDING_DIR)/online-theme" ; then mkdir -p 
$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions ; cp -a 
"$(APP_BRANDING_DIR)/online-theme" 
"$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions/online" 
; fi
@touch 
"$(abs_top_srcdir)/android/app/src/main/res/drawable/ic_launcher_brand.xml" # 
to avoid problems with a missing resource in the non-branded builds
@echo
@echo "Copied JS, HTML and CSS to the Android project 
(android/lib/src/main/assets/dist)."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-25 Thread Tor Lillqvist (via logerrit)

 loleaflet/Makefile.am |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 54e85d9cc2f7ecbd953a68fdadbf6c66f23b1b59
Author: Tor Lillqvist 
AuthorDate: Mon Nov 25 13:11:46 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Nov 25 13:49:29 2019 +0100

Fix build without --enable-debug

Since c59bf4ed3a95e742f1610277ec8b0906070ed2bf, $(ENABLE_DEBUG) is
eiher "false" or "true", not empty or "true". So we can't check it in
Makefiles with just $(if $(ENABLE_DEBUG),...), that will match also
the value "false".

Change-Id: I17c079f1c3a6346e9f0a0219f07f642673b55a98
Reviewed-on: https://gerrit.libreoffice.org/83663
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5eac57527..c412f71a3 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -100,7 +100,7 @@ LOLEAFLET_CSS_M4 = $(strip $(foreach 
file,$(LOLEAFLET_CSS),$(notdir $(file
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
 
 NODE_MODULES_JS =\
-   $(if 
$(ENABLE_DEBUG),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js)
 \
+   $(if $(filter 
true,$(ENABLE_DEBUG)),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js)
 \
node_modules/jquery/dist/jquery.js \
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
@@ -136,7 +136,7 @@ COMMA := ,
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h")
-LOLEAFLET_PREFIX := $(if $(ENABLE_DEBUG),$(abs_builddir),$(abs_builddir)/build)
+LOLEAFLET_PREFIX := $(if $(filter 
true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_builddir)/build)
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
@@ -177,7 +177,7 @@ endif
 
 $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(LOLEAFLET_PREFIX)/dist/admin-src.js
-   @NODE_PATH=$(abs_builddir)/node_modules:$(LOLEAFLET_PREFIX)/dist 
$(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if 
$(ENABLE_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
+   @NODE_PATH=$(abs_builddir)/node_modules:$(LOLEAFLET_PREFIX)/dist 
$(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter 
true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
 $(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@echo "Checking for admin JS errors..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-08 Thread Jan Holesovsky (via logerrit)

 loleaflet/Makefile.am |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7b97c5b01919dea91309b3143e7a2adde076bf2a
Author: Jan Holesovsky 
AuthorDate: Fri Nov 8 23:04:47 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Nov 8 23:04:47 2019 +0100

android: Update the branding layout.

Change-Id: I661dfbda731fb0ef7772364c30b879a19f40a322

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5409d9edb..94d6506a3 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -165,8 +165,8 @@ if ENABLE_ANDROIDAPP
@rm -rf $(abs_top_srcdir)/android/lib/src/main/assets/dist
@cp -a $(builddir)/dist $(abs_top_srcdir)/android/lib/src/main/assets/
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/ ; else touch 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/branding.css ; fi
-   @if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)"/*.svg 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi
-   @if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/toolbar-bg-logo.svg" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
+   @if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)"/images/*.svg 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi
+   @if test -d "$(APP_BRANDING_DIR)" ; then cp -a 
"$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg" 
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
@echo
@echo "Copied JS, HTML and CSS to the Android project 
(android/lib/src/main/assets/dist)."
@echo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-16 Thread Szymon Kłos (via logerrit)

 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1b3a8bd4782560e9d7c358ccf4b88d8b2f2781eb
Author: Szymon Kłos 
AuthorDate: Wed Oct 16 17:40:53 2019 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 16 17:40:59 2019 +0200

Use mobilewizard.css also

Change-Id: I6d8667f30e6ed35ee930f50ae247fd6522f5d251

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3876d7d22..2a937dea9 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -90,6 +90,7 @@ LOLEAFLET_CSS =\
$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
$(srcdir)/css/menubar.css \
$(srcdir)/css/menubar-mobile.css \
+   $(srcdir)/css/mobilewizard.css \
$(srcdir)/css/vex.css \
$(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-04 Thread Szymon Kłos (via logerrit)

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

New commits:
commit c1e96bff457de9b0263436dc4fbc1f43300aca0c
Author: Szymon Kłos 
AuthorDate: Thu Oct 3 16:04:14 2019 +0200
Commit: Szymon Kłos 
CommitDate: Fri Oct 4 11:43:15 2019 +0200

Fix build, not existing Mobile.Input.js

Change-Id: If443850bad4fd40886e378e3f7ede1eb52bb69ea
Reviewed-on: https://gerrit.libreoffice.org/80139
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1a6e1c345..160e36ee8 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -332,7 +332,6 @@ pot:
src/control/Control.DownloadProgress.js \
src/control/Control.JSDialogBuilder.js \
src/control/Control.Menubar.js \
-   src/control/Control.MobileInput.js \
src/control/Control.MobileWizard.js \
src/control/Control.Scroll.Annotation.js \
src/control/Control.Tabs.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po

2019-09-17 Thread Andras Timar (via logerrit)

 loleaflet/Makefile.am |   10 
 loleaflet/po/templates/ios.pot|8 
 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |  385 ++
 4 files changed, 248 insertions(+), 157 deletions(-)

New commits:
commit 448f0503728f0bc7551224d7ece747b5ee988431
Author: Andras Timar 
AuthorDate: Tue Sep 17 10:52:53 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 17 10:52:53 2019 +0200

Updated pot files

Change-Id: I560f9eff4556941d211d03080237d2cf0599aa6f

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 6735ee232..c62f55949 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -331,19 +331,23 @@ pot:
src/control/Control.DocumentRepair.js \
src/control/Control.DownloadProgress.js \
src/control/Control.Menubar.js \
+   src/control/Control.MobileInput.js \
src/control/Control.Scroll.Annotation.js \
src/control/Control.Tabs.js \
src/control/Control.Toolbar.js \
-   src/control/Signing.js \
src/control/Ruler.js \
+   src/control/Signing.js \
src/control/Toolbar.js \
src/core/Socket.js \
src/errormessages.js \
src/layer/marker/Annotation.js \
+   src/layer/marker/ClipboardContainer.js \
+   src/layer/tile/CalcTileLayer.js \
+   src/layer/tile/ImpressTileLayer.js \
src/layer/tile/TileLayer.js \
-   src/layer/tile/TileLayer.TableOverlay.js \
-   src/map/Map.js \
+   src/layer/tile/WriterTileLayer.js \
src/map/Clipboard.js \
+   src/map/Map.js \
src/map/handler/Map.FileInserter.js \
src/map/handler/Map.WOPI.js
 
diff --git a/loleaflet/po/templates/ios.pot b/loleaflet/po/templates/ios.pot
index 132aae6b9..177453626 100644
--- a/loleaflet/po/templates/ios.pot
+++ b/loleaflet/po/templates/ios.pot
@@ -1,11 +1,11 @@
 #. /* A single strings file, whose title is specified in your preferences 
schema. The strings files provide the localized content to display to the user 
for each of your preferences. */
-#. extracted from 
/home/timar/online/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
+#. extracted from 
/home/timar/online-master/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-02 20:32+0200\n"
+"POT-Creation-Date: 2019-09-17 10:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -26,10 +26,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: Empty+tile+cache+each+time
-msgid "Empty tile cache each time"
-msgstr ""
-
 #: Template+list+URL
 msgid "Template list URL"
 msgstr ""
diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index dc3e61bcc..e0321d7da 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-02 20:32+0200\n"
+"POT-Creation-Date: 2019-09-17 10:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index b561c6fbe..490d2f391 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-02 20:32+0200\n"
+"POT-Creation-Date: 2019-09-17 10:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Network Graph"
 msgstr ""
 
-#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:241
+#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:248
 msgid "Save"
 msgstr ""
 
@@ -165,6 +165,10 @@ msgstr ""
 msgid "Shutdown Server"
 msgstr ""
 
+#: admin/admin.strings.js:43
+msgid "Server uptime"
+msgstr ""
+
 #: admin/src/AdminSocketAnalytics.js:219
 msgid "Received"
 msgstr ""
@@ -177,11 +181,11 @@ msgstr ""
 msgid "Connection error"
 msgstr ""
 
-#: admin/src/AdminSocketOverview.js:101
+#: admin/src/AdminSocketOverview.js:102
 msgid "Are you sure you want to terminate this session?"
 msgstr ""
 
-#: admin/src/AdminSocketOverview.js:182 admin/src/AdminSocketOverview.js:284
+#: admin/src/AdminSocketOverview.js:183 admin/src/AdminSocketOverview.js:285
 msgid "Documents"
 msgstr ""
 
@@ -229,6 +233,10 @@ msgstr ""
 msgid "The server encountered a %0

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

2019-08-19 Thread Henry Castro (via logerrit)

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

New commits:
commit 7af08ddc85c93e775bb59024323ba34cb5ec6943
Author: Henry Castro 
AuthorDate: Thu May 30 11:34:25 2019 -0400
Commit: Henry Castro 
CommitDate: Mon Aug 19 17:11:04 2019 +0200

loleaflet: makefile: do not use hammer.j minified library

It is hard to debug the library if it is minfied,
it is preferable to non minified when --enable-debug is set

Change-Id: I7886d047d8aab90b68c12bb50964d263445d8afe
Reviewed-on: https://gerrit.libreoffice.org/77733
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cb8522a6b..dec3ac5b6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -90,7 +90,7 @@ LOLEAFLET_CSS_M4 = $(strip $(foreach 
file,$(LOLEAFLET_CSS),$(notdir $(file
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
 
 NODE_MODULES_JS =\
-   node_modules/hammerjs/hammer.min.js \
+   $(if 
$(ENABLE_DEBUG),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js)
 \
node_modules/jquery/dist/jquery.js \
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-02 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 9c2ca2d50213f7b7a66523de45f264d94d954a43
Author: Henry Castro 
AuthorDate: Thu May 2 15:26:05 2019 -0400
Commit: Henry Castro 
CommitDate: Thu May 2 15:53:28 2019 -0400

loleaflet: makefile: create variable to expand more JS libs

It simplifies and expand more Javascript Libraries to be used in
"loleaflet" bundle

Change-Id: I94aab1989fcef844344a297cd511c796ba642bd4

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 83d613f2c..d4ac0e620 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -101,6 +101,10 @@ NODE_MODULES_JS =\
node_modules/vex-js/js/vex.dialog.js \
node_modules/@braintree/sanitize-url/dist.js
 
+LOLEAFLET_LIBS_JS =\
+   jquery.mCustomScrollbar.js \
+   w2ui-1.5.rc1.js
+
 if !ENABLE_MOBILEAPP
 NODE_MODULES_JS +=\
node_modules/l10n-for-node/l10n.js
@@ -109,6 +113,9 @@ endif
 NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
 NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
 
+LOLEAFLET_LIBS_JS_SRC = $(patsubst %.js,$(srcdir)/js/%.js,$(LOLEAFLET_LIBS_JS))
+LOLEAFLET_LIBS_JS_DST = $(patsubst 
%.js,$(builddir)/dist/%.js,$(LOLEAFLET_LIBS_JS))
+
 LOLEAFLET_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
-e "try {console.log(require('$(1)').getFiles().join(' '))} catch(e) {}"))
 
 LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js')
@@ -177,8 +184,7 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(builddir)/dist/jquery.mCustomScrollbar.js \
-   $(builddir)/dist/w2ui-1.5.rc1.js
+   $(LOLEAFLET_LIBS_JS_DST)
@touch $@
 else
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@@ -202,14 +208,12 @@ $(builddir)/dist/global.js: $(srcdir)/js/global.js
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(srcdir)/js/jquery.mCustomScrollbar.js \
-   $(srcdir)/js/w2ui-1.5.rc1.js
+   $(LOLEAFLET_LIBS_JS_SRC)
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
$(L10N_IOS_ALL_JS) \
$(NODE_MODULES_JS) \
-   $(srcdir)/js/jquery.mCustomScrollbar.js \
-   $(srcdir)/js/w2ui-1.5.rc1.js \
+   $(LOLEAFLET_LIBS_JS_SRC) \
$(builddir)/build/dist/loleaflet-src.js \
--output $@
 endif
@@ -227,8 +231,7 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
-DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \
-DGLOBAL_JS="$(abs_builddir)/dist/global.js" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
-   jquery.mCustomScrollbar.js \
-   w2ui-1.5.rc1.js \
+   $(LOLEAFLET_LIBS_JS) \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js))" \
$(srcdir)/html/loleaflet.html.m4 > $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po scripts/plist2pot.sh

2019-04-13 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |8 
 loleaflet/po/templates/ios.pot|   24 -
 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |  406 ++
 scripts/plist2pot.sh  |   35 --
 5 files changed, 220 insertions(+), 255 deletions(-)

New commits:
commit 5f10b44f00651bcaa3b87c65f4fe8b97a0b6bf05
Author: Andras Timar 
AuthorDate: Sat Apr 13 21:59:41 2019 +0200
Commit: Andras Timar 
CommitDate: Sat Apr 13 21:59:41 2019 +0200

Extract iOS strings with prop2po from Translate Toolkit + update pots

Change-Id: I0b7a7f2b9dd9bcbc52117fbe3e1009cc5f629ea2

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2f3132365..83d613f2c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -332,11 +332,17 @@ pot:
 
html2po --pot --input=html/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot --duplicates=merge
 
-   $(abs_top_srcdir)/scripts/plist2pot.sh 
$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/Root.plist 
po/templates/ios.pot
+   prop2po --pot --personality=strings --encoding=utf8 
--input=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
 --output=po/templates/ios.pot
 
 l10n: pot
for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
for i in po/help-*.po; do pot2po 
--input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv 
$$i.new $$i;done
+   for i in po/ios-*.po;do pot2po --input=po/templates/ios.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i; done
+# FIXME: po2prop gives 'string index out of range' error.
+#  for lang in ca cs da de el es fi fr hr hu id it ja ko ms nl no pl pt 
pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
+#  mkdir -p 
$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/$$lang.lproj; \
+#  po2prop --personality=strings --encoding=utf8 
--template=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
 --input=po/ios-$$lang.po 
--output=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/$$lang.lproj/Root.strings;
 \
+#  done
 
 clean-local:
rm -rf node_modules
diff --git a/loleaflet/po/templates/ios.pot b/loleaflet/po/templates/ios.pot
index 09b045ed7..0582d1074 100644
--- a/loleaflet/po/templates/ios.pot
+++ b/loleaflet/po/templates/ios.pot
@@ -1,39 +1,35 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
+#. /* A single strings file, whose title is specified in your preferences 
schema. The strings files provide the localized content to display to the user 
for each of your preferences. */
+#. extracted from 
/home/timar/online/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-29 22:35+0100\n"
+"POT-Creation-Date: 2019-04-13 21:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
 
-#: Root.plist
+#: App+info
 msgid "App info"
 msgstr ""
 
-#: Root.plist
+#: Version
 msgid "Version"
 msgstr ""
 
-#: Root.plist
+#: Settings
 msgid "Settings"
 msgstr ""
 
-#: Root.plist
+#: Empty+tile+cache+each+time
 msgid "Empty tile cache each time"
 msgstr ""
 
-#: Root.plist
+#: Template+list+URL
 msgid "Template list URL"
 msgstr ""
-
diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index 7576e3b18..53476f2a2 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-29 22:35+0200\n"
+"POT-Creation-Date: 2019-04-13 21:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index bafb00801..ac95e2315 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-29 22:35+0100\n"
+"POT-Creation-Date: 2019-04-13 21:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -217,209 +217,6 @@ msgstr ""
 msgid " s"
 msgstr ""
 
-#: src/control/toolbar.js:198
-msgid "Are

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

2019-04-01 Thread Libreoffice Gerrit user

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

New commits:
commit 7f63e7658df621e7669b17786cbcf98f2317234b
Author: Samuel Mehrbrodt 
AuthorDate: Mon Apr 1 10:27:32 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Apr 1 10:27:32 2019 +0200

Fix path (again)

After 59306e2f4c9b6d9ea2d669b5b9ae45573bbbc160 "loleaflet: rename 
toolbar.js to Control.Toolbar.js"

Change-Id: Iaa5556da289e23b8942a020b75a805c87dc03c70

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c915343fb..7adbd48c6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -310,13 +310,13 @@ pot:
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketSettings.js \
admin/src/Util.js \
-   src/control/toolbar.js \
src/control/Control.AlertDialog.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
src/control/Control.Scroll.Annotation.js \
src/control/Control.Tabs.js \
+   src/control/Control.Toolbar.js \
src/control/Signing.js \
src/control/Ruler.js \
src/control/Toolbar.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-21 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 74f19fce6f91a1651efce415fb4b495a89faff23
Author: Tor Lillqvist 
AuthorDate: Thu Mar 21 17:17:56 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 21 17:20:27 2019 +0200

We insert global.js in loleaflet.html and shouldn't include it in bundle.js

Also, make loleaflet.html depend also on the two files that are inserted 
into
it with the m4 syscmd thing, bundle.css and global.js.

Change-Id: Iba261aeff70786eec114e5508b748dadd8663038

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5f51a91a4..6a9b0cb37 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -175,7 +175,6 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
$(builddir)/dist/w2ui-1.5.rc1.js
@touch $@
@@ -201,12 +200,10 @@ $(builddir)/dist/global.js: $(srcdir)/js/global.js
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.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 \
@@ -215,7 +212,8 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
--output $@
 endif
 
-$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) \
+$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) $(builddir)/dist/bundle.css $(builddir)/dist/global.js \
+\
$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
@echo "Generating loleaflet.html..."
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-18 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9c74b8e14f97b215ef50b0071290b2610ea5b958
Author: Andras Timar 
AuthorDate: Mon Mar 18 14:20:26 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 18 14:20:26 2019 +0100

put back po->json make rule

Change-Id: Idbd45a48f3215f36b68e444a83c4eb07ea37e1bb

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index fdcbb59e0..5d3f735d6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -291,6 +291,9 @@ $(builddir)/dist/l10n/%: $(srcdir)/l10n/%
@mkdir -p $(dir $@)
@cp $< $@
 
+$(builddir)/dist/l10n/%.json: $(srcdir)/po/%.po
+   @$(srcdir)/util/po2json.py $< -o $@
+
 $(builddir)/dist/admin/%: $(srcdir)/admin/%
@mkdir -p $(dir $@)
@cp $< $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-18 Thread Libreoffice Gerrit user

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

New commits:
commit 58eab0bbb5dd2d8b80aab347238a584c32150721
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 18 11:41:57 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 18 11:44:32 2019 +0100

Fix path

Change-Id: Ie04f809e6d6b1c87a4fe4d66132c9c51551b0b04
Reviewed-on: https://gerrit.libreoffice.org/69383
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9cf916e57..fdcbb59e0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -307,7 +307,7 @@ pot:
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketSettings.js \
admin/src/Util.js \
-   scr/control/toolbar.js \
+   src/control/toolbar.js \
src/control/Control.AlertDialog.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am|2 --
 loleaflet/src/core/Socket.js |2 +-
 loleaflet/src/map/Map.js |   39 ++-
 3 files changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 31aa763470f9dfc3df5280c2f2fab47c15432afd
Author: Henry Castro 
AuthorDate: Sat Feb 16 18:09:52 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 23:55:39 2019 -0400

loleaflet: remove timeago.min.js

simplify using Date.toLocaleDateString

Change-Id: Ib264cd90edd7ddacb3b944ee7f252648a629ab3f

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d3e0160e0..953add0c6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -232,8 +232,6 @@ NODE_MODULES_JS =\
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/timeago.js/dist/timeago.min.js \
-   node_modules/timeago.js/dist/timeago.locales.min.js \
node_modules/autolinker/dist/Autolinker.js \
node_modules/json-js/json2.js \
node_modules/select2/dist/js/select2.js \
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 68080b9fa..3fe3cb2c7 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -322,7 +322,7 @@ L.Socket = L.Class.extend({
return;
}
else if (textMsg.startsWith('lastmodtime: ')) {
-   var time = textMsg.substring(textMsg.indexOf(' '));
+   var time = textMsg.substring(textMsg.indexOf(' ') + 1);
this._map.updateModificationIndicator(time);
return;
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 9f7f35af3..b0a5b9da5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -16,7 +16,7 @@ function moveObjectVertically(obj, diff) {
}
 }
 
-/* global timeago closebutton vex $ _ */
+/* global closebutton vex $ _ */
 L.Map = L.Evented.extend({
 
options: {
@@ -312,20 +312,33 @@ L.Map = L.Evented.extend({
},
 
updateModificationIndicator: function(newModificationTime) {
-   this._lastmodtime = newModificationTime;
+   var timeout;
+
+   if (typeof newModificationTime === 'string') {
+   this._lastmodtime = newModificationTime;
+   }
+
+   clearTimeout(this._modTimeout);
+
if (this.lastModIndicator !== null && this.lastModIndicator !== 
undefined) {
-   // Get locale
-   var special = [ 'bn_IN', 'hi_IN', 'id_ID', 'nb_NO', 
'nn_NO', 'pt_BR', 'zh_CN', 'zh_TW'];
-   var locale = String.locale;
-   locale = locale.replace('-', '_');
-   if ($.inArray(locale, special) < 0) {
-   if (locale.indexOf('_') > 0) {
-   locale = locale.substring(0, 
locale.indexOf('_'));
-   }
+   var dateTime = new 
Date(this._lastmodtime.replace(/,.*/, 'Z'));
+   var dateValue = 
dateTime.toLocaleDateString(String.locale,
+   { year: 'numeric', month: 'short', day: 
'numeric', hour: '2-digit', minute: '2-digit' });
+
+   var elapsed = Date.now() - dateTime;
+   if (elapsed < 6) {
+   dateValue = Math.round(elapsed / 1000) + ' ' + 
_('seconds ago');
+   timeout = 6000;
+   } else if (elapsed < 360) {
+   dateValue = Math.round(elapsed / 6) + ' ' + 
_('minutes ago');
+   timeout = 6;
+   }
+
+   this.lastModIndicator.innerHTML = dateValue;
+
+   if (timeout) {
+   this._modTimeout = 
setTimeout(L.bind(this.updateModificationIndicator, this, -1), timeout);
}
-   // Real-time auto update
-   this.lastModIndicator.setAttribute('datetime', 
newModificationTime);
-   timeago().render(this.lastModIndicator, locale);
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/src

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am|3 +--
 loleaflet/src/core/Socket.js |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1d801b833f76239e0b0f44d285e0dd57498cc9d1
Author: Henry Castro 
AuthorDate: Wed Feb 13 11:04:44 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 23:50:39 2019 -0400

loleaflet: remove jquery.time ago

use Date.toLocaleDateString that returns a string with a language sensitive
representation of the date portion of this date

Change-Id: Id2e207e5b4d0dbc8d82498567c97105052d70b90

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 697877b67..d3e0160e0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -232,7 +232,6 @@ NODE_MODULES_JS =\
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/timeago/jquery.timeago.js \
node_modules/timeago.js/dist/timeago.min.js \
node_modules/timeago.js/dist/timeago.locales.min.js \
node_modules/autolinker/dist/Autolinker.js \
@@ -357,7 +356,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(builddir)/build/dist/loleaflet-src.js \
$(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js \
-   --source-map --output $@
+   --output $@
 endif
 
 $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 
$(LOLEAFLET_HTML_DST) \
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 2009418af..68080b9fa 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -125,7 +125,9 @@ L.Socket = L.Class.extend({
if (parseInt(this._map.options.docParams.access_token_ttl) - 
Date.now() <= 0) {
expirymsg = errorMessages.sessionexpired;
}
-   var timerepr = 
$.timeago(parseInt(this._map.options.docParams.access_token_ttl)).replace(' 
ago', '');
+   var dateTime = new 
Date(parseInt(this._map.options.docParams.access_token_ttl));
+   var dateOptions = { year: 'numeric', month: 'short', day: 
'numeric', hour: '2-digit', minute: '2-digit' };
+   var timerepr = dateTime.toLocaleDateString(String.locale, 
dateOptions);
this._map.fire('warn', {msg: expirymsg.replace('%time', 
timerepr)});
 
// If user still doesn't refresh the session, warn again 
periodically
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 4a31a3beac9892d98138af8a9446025587293891
Author: Henry Castro 
AuthorDate: Sun Feb 10 20:21:18 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 23:37:27 2019 -0400

loleaflet: fix debug makefile rules

Change-Id: I90f7e1789e631d1a3194316e1c01012326f671ab

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4bb13c046..81d8c4614 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -249,12 +249,6 @@ NODE_MODULES_JS_DST = $(patsubst 
%.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
 LOLEAFLET_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
-e "try {console.log(require('$(1)').getFiles().join(' '))} catch(e) {}"))
 LOPLUGIN_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
-e "try {console.log(require('$(1)').deps.join(' '))} catch(e) {}"))
 
-PLUGINS_JS =\
-   jquery.mCustomScrollbar.js \
-   w2ui-1.5.rc1.js \
-   toolbar.js \
-   main.js
-
 LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js')
 LOLEAFLET_JS_DST = $(patsubst 
$(srcdir)/src/%.js,$(builddir)/dist/src/%.js,$(LOLEAFLET_JS_SRC))
 
@@ -380,9 +374,12 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
-DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \
-DGLOBAL_JS="$(abs_builddir)/dist/global.js" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
+   jquery.mCustomScrollbar.js \
+   w2ui-1.5.rc1.js \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
$(patsubst %.js,plugins/path-transform/%.js,$(call 
LOPLUGIN_JS,$(srcdir)/plugins/path-transform/build/deps.js)) \
-   $(PLUGINS_JS))" \
+   toolbar.js \
+   main.js)" \
$(srcdir)/html/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/plugins

2019-03-05 Thread Libreoffice Gerrit user

 dev/null|binary
 loleaflet/Makefile.am   |   21 
 loleaflet/plugins/draw-0.2.4/.gitattributes |   22 
 loleaflet/plugins/draw-0.2.4/.gitignore |  167 
 loleaflet/plugins/draw-0.2.4/BREAKINGCHANGES.md |   54 
 loleaflet/plugins/draw-0.2.4/CHANGELOG.md   |  145 
 loleaflet/plugins/draw-0.2.4/MIT-LICENCE.txt|   20 
 loleaflet/plugins/draw-0.2.4/README.md  |  440 -
 loleaflet/plugins/draw-0.2.4/TODO.md|   62 
 loleaflet/plugins/draw-0.2.4/build/build.html   |  243 
 loleaflet/plugins/draw-0.2.4/build/build.js |   87 
 loleaflet/plugins/draw-0.2.4/build/deps.js  |   78 
 loleaflet/plugins/draw-0.2.4/build/hintrc.js|   40 
 loleaflet/plugins/draw-0.2.4/build/leaflet.draw-include.js  |   43 
 loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.css  |  308 
 loleaflet/plugins/draw-0.2.4/examples/basic.html|  114 
 loleaflet/plugins/draw-0.2.4/examples/edithandlers.html |   67 
 loleaflet/plugins/draw-0.2.4/examples/full.html |   66 
 loleaflet/plugins/draw-0.2.4/examples/libs/leaflet.css  |  478 -
 loleaflet/plugins/draw-0.2.4/package.json   |   39 
 loleaflet/plugins/draw-0.2.4/spec/after.js  |3 
 loleaflet/plugins/draw-0.2.4/spec/before.js |4 
 loleaflet/plugins/draw-0.2.4/spec/expect.js | 1254 --
 loleaflet/plugins/draw-0.2.4/spec/happen.js |   94 
 loleaflet/plugins/draw-0.2.4/spec/karma.conf.js |   73 
 loleaflet/plugins/draw-0.2.4/spec/sinon.js  | 4224 
--
 loleaflet/plugins/draw-0.2.4/spec/spec.hintrc.js|   26 
 loleaflet/plugins/draw-0.2.4/spec/suites/DrawControlSpec.js |   15 
 loleaflet/plugins/draw-0.2.4/spec/suites/EditSpec.js|   72 
 loleaflet/plugins/draw-0.2.4/spec/suites/GeometryUtilSpec.js|   26 
 loleaflet/plugins/draw-0.2.4/spec/suites/LatLngUtilSpec.js  |   12 
 loleaflet/plugins/draw-0.2.4/spec/suites/SpecHelper.js  |   29 
 loleaflet/plugins/draw-0.2.4/src/Control.Draw.js|  105 
 loleaflet/plugins/draw-0.2.4/src/Leaflet.draw.js|  103 
 loleaflet/plugins/draw-0.2.4/src/Toolbar.js |  245 
 loleaflet/plugins/draw-0.2.4/src/Tooltip.js |   64 
 loleaflet/plugins/draw-0.2.4/src/copyright.js   |9 
 loleaflet/plugins/draw-0.2.4/src/draw/DrawToolbar.js|   88 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Circle.js|   64 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Feature.js   |   79 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Marker.js|  103 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Polygon.js   |  104 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Polyline.js  |  434 -
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.Rectangle.js |   60 
 loleaflet/plugins/draw-0.2.4/src/draw/handler/Draw.SimpleShape.js   |   95 
 loleaflet/plugins/draw-0.2.4/src/edit/EditToolbar.js|  166 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/Edit.Circle.js|   64 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/Edit.Marker.js|   75 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/Edit.Poly.js  |  285 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/Edit.Rectangle.js |  126 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/EditToolbar.Delete.js |  134 
 loleaflet/plugins/draw-0.2.4/src/edit/handler/EditToolbar.Edit.js   |  184 
 loleaflet/plugins/draw-0.2.4/src/ext/GeometryUtil.js|   69 
 loleaflet/plugins/draw-0.2.4/src/ext/LatLngUtil.js  |   19 
 loleaflet/plugins/draw-0.2.4/src/ext/LineUtil.Intersect.js  |   16 
 loleaflet/plugins/draw-0.2.4/src/ext/Polygon.Intersect.js   |   28 
 loleaflet/plugins/draw-0.2.4/src/ext/Polyline.Intersect.js  |   86 
 loleaflet/plugins/draw-0.2.4/src/images/spritesheet.svg |   41 
 58 files changed, 2 insertions(+), 11170 deletions(-)

New commits:
commit 3d91ea94a90fa47b3aea38fe4b8f8fc5cee1
Author: Henry Castro 
AuthorDate: Sun Feb 10 19:53:57 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 23:20:24 2019 -0400

loleaflet: remove unused draw plugin

Change-Id: I6acdec7a5e04ba9cd370b80a3a04b54d370420a0

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 31df8f092..4bb13c046 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,5

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

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |  167 ++
 1 file changed, 154 insertions(+), 13 deletions(-)

New commits:
commit 59241a2ea467992adadbacae00a15ec7fe0de2d9
Author: Henry Castro 
AuthorDate: Tue Mar 5 17:59:38 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 18:09:24 2019 -0400

configure:L10n: compile message catalog to binary format

Change-Id: Ia5170a70b80996623260578ece71c63db6510a25

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 7f90ca147..e220dbd62 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,11 +1,142 @@
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
-L10N_PO = $(wildcard $(srcdir)/po/*.po)
-
-if !ENABLE_MOBILEAPP
-L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
-endif
+LANGUAGES = \
+   ab \
+   af \
+   am \
+   an \
+   anp \
+   ar \
+   as \
+   ast \
+   az \
+   bar \
+   be \
+   bg \
+   bm \
+   bn_IN \
+   bn \
+   bo \
+   br \
+   brx \
+   bs \
+   ca \
+   ca-valencia \
+   ce \
+   cs \
+   cy \
+   da \
+   de \
+   dgo \
+   dsb \
+   dz \
+   el \
+   en_AU \
+   en_GB \
+   en_ZA \
+   eo \
+   es \
+   et \
+   eu \
+   fa \
+   fi \
+   fr \
+   fur \
+   fy \
+   ga \
+   gbm \
+   gd \
+   gl \
+   gug \
+   gu \
+   he \
+   hi \
+   hr \
+   hsb \
+   hu \
+   hy \
+   id \
+   is \
+   it \
+   ja \
+   jv \
+   kab \
+   ka \
+   kk \
+   kl \
+   km \
+   kmr-Latn \
+   kn \
+   kok \
+   ko \
+   ks \
+   ky \
+   lb \
+   lo \
+   lt \
+   lv \
+   mai \
+   mk \
+   ml \
+   mni \
+   ml \
+   mr \
+   mt \
+   my \
+   nah \
+   nb \
+   ne \
+   nl \
+   nn \
+   nqo \
+   nr \
+   nso \
+   oc \
+   om \
+   or \
+   pa_IN \
+   pap_CW \
+   pl \
+   pt_BR \
+   pt \
+   ro \
+   ru \
+   rw \
+   sah \
+   sa_IN \
+   sat \
+   sd \
+   sid \
+   si \
+   sk \
+   sl \
+   sq \
+   ss \
+   st \
+   sv \
+   sw_TZ \
+   ta \
+   te \
+   tg \
+   th \
+   ti \
+   tn \
+   tr \
+   ts \
+   tt \
+   ug \
+   uk \
+   ur \
+   uz \
+   vec \
+   ve \
+   vi \
+   wo \
+   xh \
+   zh_CN \
+   zh_TW \
+   zu
 
 if ENABLE_IOSAPP
 L10N_IOS_ALL_JS = $(builddir)/dist/l10n-all.js
@@ -53,6 +184,11 @@ LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name 
'*.html')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
 LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(builddir)/dist/admin/%,$(LOLEAFLET_ADMIN_SRC))
 
+define lang_target
+$(1):: $(2)
+
+endef
+
 define file_target
 $(1): $(2)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
@@ -94,8 +230,15 @@ LOLEAFLET_CSS =\
 
 LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file
+LOLEAFLET_MO_DST = $(foreach 
lang,$(LANGUAGES),$(top_builddir)/locale/$(lang)/LC_MESSAGES/loolwsd.mo)
 
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
+$(eval $(foreach lang,$(LANGUAGES), \
+   $(call 
lang_target,$(top_builddir)/locale/$(lang)/LC_MESSAGES/loolwsd.mo, \
+   $(srcdir)/po/help-$(lang).po $(srcdir)/po/ui-$(lang).po 
\
+   ) \
+   ) \
+)
 
 NODE_MODULES_JS =\
node_modules/hammerjs/hammer.min.js \
@@ -153,8 +296,8 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(builddir)/dist/admin-bundle.js
 endif
 
-build-loleaflet: | $(LOLEAFLET_L10N_DST) \
-   $(L10N_JSON) \
+build-loleaflet: | \
+   $(LOLEAFLET_MO_DST) \
$(LOLEAFLET_IMAGES_DST) \
$(JQUERY_LIGHTNESS_DIST_IMAGES) \
$(JQUERY_MINIFIED_DIST_IMAGES) \
@@ -336,13 +479,10 @@ $(builddir)/dist/images/%.png: 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png
@mkdir -p $(dir $@)
@cp $< $@
 
-$(builddir)/dist/l10n/%.json: $(srcdir)/l10n/%.json
+$(top_builddir)/locale/%/LC_MESSAGES/loolwsd.mo: $(srcdir)/po/help-%.po 
$(srcdir)/po/ui-%.po
+   @echo "INFO: compiling message catalog $@"
@mkdir -p $(dir $@)
-if ENABLE_DEBUG
-   @cp $< $@
-else
-   @tr -d '[:space:]' <$<  >$@
-endif
+   @$(MSGCAT) $^ | $(MSGFMT) -o $@ -
 
 $(builddir)/dist/l10n/%.json: $(srcdir)/po/%.po
@$(srcdir)/util/po2json.py $< -o $@
@@ -390,6 +530,7 @@ l10n: pot
 clean-local:
rm -rf node_modules
rm -rf $(builddir)/dist
+   rm -rf $(top_builddir)/locale
rm -rf $(builddir)/build/dist
 
 spec/data/load-test:
___

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

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 88a8810ee79215f706c3394bf92072a9dea2c068
Author: Henry Castro 
AuthorDate: Fri Feb 1 10:59:29 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 15:40:59 2019 -0400

loleaflet: minify l10n files

Change-Id: I811d945e6767a0716244f8b1f42a8e1f2b727775

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a1b860762..7f90ca147 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -336,9 +336,13 @@ $(builddir)/dist/images/%.png: 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png
@mkdir -p $(dir $@)
@cp $< $@
 
-$(builddir)/dist/l10n/%: $(srcdir)/l10n/%
+$(builddir)/dist/l10n/%.json: $(srcdir)/l10n/%.json
@mkdir -p $(dir $@)
+if ENABLE_DEBUG
@cp $< $@
+else
+   @tr -d '[:space:]' <$<  >$@
+endif
 
 $(builddir)/dist/l10n/%.json: $(srcdir)/po/%.po
@$(srcdir)/util/po2json.py $< -o $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3aebf7fea9561416a7c904a16712dba254120989
Author: Henry Castro 
AuthorDate: Thu Jan 31 15:43:22 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 15:32:59 2019 -0400

loleaflet: uglify l10n.js

Change-Id: I050d6d82e9d6b3df3cd51426931136b3f14eb730

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ca8f63f3c..a1b860762 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -231,6 +231,10 @@ $(builddir)/dist/global.js: $(srcdir)/js/global.js
@echo "Uglify global.js file..."
@NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs $< --output $@
 
+$(builddir)/dist/l10n.js: $(srcdir)/js/l10n.js
+   @echo "Uglify l10n.js file..."
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs $< --output $@
+
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-05 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |4 
 1 file changed, 4 insertions(+)

New commits:
commit c801696ab1f64715f56d22453deb47db80f6a9cb
Author: Henry Castro 
AuthorDate: Sun Jan 27 16:46:41 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Mar 5 14:08:53 2019 -0400

loleaflet: uglify global.js file

Change-Id: Ibcc265830c10042a918784b350fe93566147993a

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bc23ee763..36492e912 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -226,6 +226,10 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS)
@echo "Uglify loleaflet css files..."
@NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
 
+$(builddir)/dist/global.js: $(srcdir)/js/global.js
+   @echo "Uglify global.js file..."
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs $< --output $@
+
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-09 Thread Libreoffice Gerrit user

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

New commits:
commit 58ee16d4ed192948a659f0a892cb97ac3234734e
Author: Tor Lillqvist 
AuthorDate: Fri Nov 9 19:58:27 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 9 19:58:32 2018 +0200

Do generate the loleaflet/dist/l10n/*.json files for iOS

Not used yet by the app but I am working on figuring out some way.

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c5dea0aad..9b61070c2 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -3,15 +3,9 @@ DRAW_VERSION=0.2.4
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
 
-# It would be nice to have l10n also in the iOS app, but have to
-# skip for now as that l10n-for-node code seems to always want to use
-# HTTP to load the message catalog .json files.
-
-if !ENABLE_IOSAPP
 if !ENABLE_GTKAPP
 L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
 endif
-endif
 
 JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
 JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-10-29 Thread Libreoffice Gerrit user

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

New commits:
commit fb1b7d6b448cabf6d13fb1a7eb48a6106d9b5bb9
Author: Andras Timar 
AuthorDate: Mon Oct 29 13:10:29 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Oct 29 13:10:29 2018 +0100

remove obsolete comment

Change-Id: I69168335c479b94ad4352a64631c1605e4314abe

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5ae2ed51c..e23798264 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,8 +1,3 @@
-# Version number of loleaflet, no need to be in sync with the loolwsd
-# one, but do please follow the same even/odd convention for the third
-# ("micro") part: Between releases odd, even for releases (no other
-# changes inbetween).
-
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-08-14 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f8c1c1a74ab47504f3c00726cf10f23fd7e01578
Author: Henry Castro 
AuthorDate: Tue Aug 14 10:38:17 2018 -0400
Commit: Henry Castro 
CommitDate: Tue Aug 14 10:43:32 2018 -0400

loleaflet: run eslint when toolbar.js is modified

Change-Id: I84272849e20fefea775118960b876e62112c3701

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3b15d68ca..c5baba4b9 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -99,6 +99,9 @@ PLUGINS_JS =\
toolbar.js \
main.js
 
+PLUGINS_JS_SRC = $(shell find $(srcdir)/js -name '*.js')
+PLUGINS_JS_DST = $(patsubst 
$(srcdir)/js/%.js,$(builddir)/dist/%.js,$(PLUGINS_JS_SRC))
+
 LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js')
 LOLEAFLET_JS_DST = $(patsubst 
$(srcdir)/src/%.js,$(builddir)/dist/src/%.js,$(LOLEAFLET_JS_SRC))
 
@@ -135,7 +138,7 @@ $(LOLEAFLET_PREFIX)/dist/admin-src.js: 
$(LOLEAFLET_ADMIN_ALL)
@awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(call 
LOLEAFLET_JS,$(srcdir)/admin/build/build.js)) > $@
 
 if ENABLE_DEBUG
-$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) 
$(LOLEAFLET_DRAW_JS_DST)
+$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) 
$(LOLEAFLET_DRAW_JS_DST) $(PLUGINS_JS_DST)
@echo "Checking for loleaflet JS errors..."
@NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src  $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@touch $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/node_shrinkwrap loleaflet/npm-shrinkwrap.json.in loleaflet/package.json

2018-05-27 Thread Henry Castro

 dev/null  |binary
 loleaflet/Makefile.am |2 
 loleaflet/node_shrinkwrap/which-1.3.1.tgz |binary
 loleaflet/npm-shrinkwrap.json.in  |   88 ++
 loleaflet/package.json|9 ---
 5 files changed, 8 insertions(+), 91 deletions(-)

New commits:
commit 52be1723073da6fd8600972ffcd0eb9bb42e333d
Author: Henry Castro 
Date:   Sun May 27 07:50:37 2018 -0400

loleaflet: update node_shrinkwrap

Change-Id: Icf4683c074c6c4dc6e478412230a431137bdb7fa

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e0a0d9d8b..331e9ebad 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -136,7 +136,7 @@ $(LOLEAFLET_PREFIX)/dist/admin-src.js: 
$(LOLEAFLET_ADMIN_ALL)
 
 if ENABLE_DEBUG
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) 
$(LOLEAFLET_DRAW_JS_DST)
-   @echo "Checking loleaflet for JS errors..."
+   @echo "Checking for loleaflet JS errors..."
@NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src  $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@touch $@
 
diff --git a/loleaflet/node_shrinkwrap/ansi-styles-1.0.0.tgz 
b/loleaflet/node_shrinkwrap/ansi-styles-1.0.0.tgz
deleted file mode 100644
index 27207f891..0
Binary files a/loleaflet/node_shrinkwrap/ansi-styles-1.0.0.tgz and /dev/null 
differ
diff --git a/loleaflet/node_shrinkwrap/async-0.9.2.tgz 
b/loleaflet/node_shrinkwrap/async-0.9.2.tgz
deleted file mode 100644
index 93ad1a5f1..0
Binary files a/loleaflet/node_shrinkwrap/async-0.9.2.tgz and /dev/null differ
diff --git a/loleaflet/node_shrinkwrap/chalk-0.4.0.tgz 
b/loleaflet/node_shrinkwrap/chalk-0.4.0.tgz
deleted file mode 100644
index 2a6cfab6b..0
Binary files a/loleaflet/node_shrinkwrap/chalk-0.4.0.tgz and /dev/null differ
diff --git a/loleaflet/node_shrinkwrap/evol-colorpicker-3.2.6.tgz 
b/loleaflet/node_shrinkwrap/evol-colorpicker-3.2.6.tgz
deleted file mode 100644
index f8e24546d..0
Binary files a/loleaflet/node_shrinkwrap/evol-colorpicker-3.2.6.tgz and 
/dev/null differ
diff --git a/loleaflet/node_shrinkwrap/filelist-0.0.6.tgz 
b/loleaflet/node_shrinkwrap/filelist-0.0.6.tgz
deleted file mode 100644
index 703e24bff..0
Binary files a/loleaflet/node_shrinkwrap/filelist-0.0.6.tgz and /dev/null differ
diff --git a/loleaflet/node_shrinkwrap/has-color-0.1.7.tgz 
b/loleaflet/node_shrinkwrap/has-color-0.1.7.tgz
deleted file mode 100644
index adf244f5e..0
Binary files a/loleaflet/node_shrinkwrap/has-color-0.1.7.tgz and /dev/null 
differ
diff --git a/loleaflet/node_shrinkwrap/jake-8.0.16.tgz 
b/loleaflet/node_shrinkwrap/jake-8.0.16.tgz
deleted file mode 100644
index cf85a8697..0
Binary files a/loleaflet/node_shrinkwrap/jake-8.0.16.tgz and /dev/null differ
diff --git a/loleaflet/node_shrinkwrap/strip-ansi-0.1.1.tgz 
b/loleaflet/node_shrinkwrap/strip-ansi-0.1.1.tgz
deleted file mode 100644
index 5ffc94b25..0
Binary files a/loleaflet/node_shrinkwrap/strip-ansi-0.1.1.tgz and /dev/null 
differ
diff --git a/loleaflet/node_shrinkwrap/utilities-0.0.37.tgz 
b/loleaflet/node_shrinkwrap/utilities-0.0.37.tgz
deleted file mode 100644
index 7d39e0ab1..0
Binary files a/loleaflet/node_shrinkwrap/utilities-0.0.37.tgz and /dev/null 
differ
diff --git a/loleaflet/node_shrinkwrap/utilities-1.0.5.tgz 
b/loleaflet/node_shrinkwrap/utilities-1.0.5.tgz
deleted file mode 100644
index 25e8f7fe6..0
Binary files a/loleaflet/node_shrinkwrap/utilities-1.0.5.tgz and /dev/null 
differ
diff --git a/loleaflet/node_shrinkwrap/which-1.3.0.tgz 
b/loleaflet/node_shrinkwrap/which-1.3.0.tgz
deleted file mode 100644
index 2b704d2b9..0
Binary files a/loleaflet/node_shrinkwrap/which-1.3.0.tgz and /dev/null differ
diff --git a/loleaflet/node_shrinkwrap/which-1.3.1.tgz 
b/loleaflet/node_shrinkwrap/which-1.3.1.tgz
new file mode 100644
index 0..a4966fe59
Binary files /dev/null and b/loleaflet/node_shrinkwrap/which-1.3.1.tgz differ
diff --git a/loleaflet/npm-shrinkwrap.json.in b/loleaflet/npm-shrinkwrap.json.in
index 0cdbb868c..d904e45ca 100644
--- a/loleaflet/npm-shrinkwrap.json.in
+++ b/loleaflet/npm-shrinkwrap.json.in
@@ -201,9 +201,9 @@
   }
 },
 "async": {
-  "version": "0.9.2",
-  "resolved": "file:node_shrinkwrap/async-0.9.2.tgz",
-  "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+  "version": "0.2.10",
+  "resolved": "file:node_shrinkwrap/async-0.2.10.tgz",
+  "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
   "dev": true
 },
 "autolinker": {
@@ -1272,24 +1272,6 @@
 "object-assign": "4.1.1"
   }
 },
-"filelist": {
-  "version": "0.0.6",
-  "resolved": "file:node_shrinkwrap/filelist-0.0.6.tgz",
-  "integrity": "sha1-WKZBrR9XV0on/oekQO8xiDS1Vxk=",
-  "dev":

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

2018-05-26 Thread Henry Castro

 loleaflet/Makefile.am |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7d03ebcf5581f38f9b78a1b6e14ab2529c874591
Author: Henry Castro 
Date:   Sun May 27 00:20:29 2018 -0400

loleaflet: use the recursive Makefile to avoid parallel node_modules target

Change-Id: I1bc7d8bc4b228d104196dbd2355576bcd94c913d

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ff47889c5..e0a0d9d8b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -110,7 +110,9 @@ LOLEAFLET_PREFIX := $(if 
$(ENABLE_DEBUG),$(abs_builddir),$(abs_builddir)/build)
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
-all-local: node_modules
+all-local:
+   @$(MAKE) node_modules
+   @$(MAKE) build-loleaflet
 
 build-loleaflet: | $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
@@ -195,7 +197,6 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DS
 node_modules: npm-shrinkwrap.json
@npm install
@touch node_modules
-   @$(MAKE) build-loleaflet
 
 $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js
@mkdir -p $(dir $@)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-26 Thread Henry Castro

 loleaflet/Makefile.am |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ad2e5bd652397b34d797c8ed1c3370885b3a04b
Author: Henry Castro 
Date:   Sat May 26 10:39:20 2018 -0400

loleaflet: ensure set NODE_PATH environment variable

Change-Id: If0a632c258f740112352e9ad6a4f250bf2e2c9d8

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bb18427cd..a00568555 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -159,7 +159,7 @@ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: 
$(LOLEAFLET_JS_SRC)
 
 $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS)
@echo "Uglify loleaflet css files..."
-   @$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
@@ -168,7 +168,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js
@echo "Uglify loleaflet js files..."
-   @$(NODE) node_modules/uglify-js/bin/uglifyjs \
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
$(srcdir)/js/global.js \
$(NODE_MODULES_JS) \
$(srcdir)/js/w2ui-1.5.rc1.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-26 Thread Henry Castro

 loleaflet/Makefile.am |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f838e0998e19b1b60e4efb845af5f0ac808a948e
Author: Henry Castro 
Date:   Sat May 26 10:26:47 2018 -0400

loleaflet: fix make -j N

Change-Id: I994ff4b352c93ff910d93f5f176c4e7ced2dc21d

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index dadc1b5a1..bb18427cd 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -111,8 +111,9 @@ LOLEAFLET_PREFIX := $(if 
$(ENABLE_DEBUG),$(abs_builddir),$(abs_builddir)/build)
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
-all-local: | node_modules \
-   $(LOLEAFLET_L10N_DST) \
+all-local: node_modules
+
+build-loleaflet: | $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
$(JQUERY_UI_DIST_IMAGES) \
@@ -189,8 +190,9 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DS
$(srcdir)/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
-   npm install
-   touch node_modules
+   @npm install
+   @touch node_modules
+   @$(MAKE) build-loleaflet
 
 $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js
@mkdir -p $(dir $@)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-24 Thread Henry Castro

 loleaflet/Makefile.am |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9978c51595bef891a12f5b812aa716ad1637c7fb
Author: Henry Castro 
Date:   Thu May 24 13:39:21 2018 -0400

loleaflet: lint draw plugins

I forgot to add it, in previous commit

Change-Id: I9fce42d39d07f6d60910e2fc6fec86b7b9d6

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 980ff833f..9e2638a58 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -137,9 +137,8 @@ $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) 
$(BOOTSTRAP_DST) $(CURS
 if ENABLE_DEBUG
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) 
$(LOLEAFLET_DRAW_JS_DST)
@echo "Checking loleaflet for JS errors..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src  $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@cp -a $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist/images/* 
$(builddir)/dist/images/
-#  @$(NODE) node_modules/eslint/bin/eslint.js 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@touch $@
 
 $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
@@ -156,7 +155,7 @@ else
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@mkdir -p $(dir $@)
@echo "Checking loleaflet for JS errors..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/eslint/bin/eslint.js $(srcdir)/src 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src  $(srcdir)/js --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@echo "Concatenating loleaflet files..."
@(cat $(srcdir)/src/copyright.js | sed 
's/{VERSION}/$(LOLEAFLET_VERSION)/' - \
&& echo "(function (window, document, undefined) {" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-17 Thread Henry Castro

 loleaflet/Makefile.am |   44 ++--
 1 file changed, 18 insertions(+), 26 deletions(-)

New commits:
commit 486a525cdfe6ac802b18698db4db4f149401f0f0
Author: Henry Castro 
Date:   Thu May 17 17:13:24 2018 -0400

loleaflet: debug: do not bundle the draw plugin files

Change-Id: I022f121410eb0a3cd59b2b3b1a160ff7d244ad53

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 32eed4eda..86ea96089 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -22,6 +22,8 @@ LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*')
 LOLEAFLET_L10N_DST =  $(patsubst 
$(srcdir)/l10n/%,$(builddir)/dist/l10n/%,$(LOLEAFLET_L10N_SRC))
 
 LOLEAFLET_DRAW_JS_SRC = $(shell find 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src -name '*.js')
+LOLEAFLET_DRAW_JS_DST = $(patsubst 
$(srcdir)/plugins/%.js,$(builddir)/dist/plugins/%.js,$(LOLEAFLET_DRAW_JS_SRC))
+
 LOLEAFLET_DRAW_CSS_SRC = $(shell find 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/dist -name '*.css')
 
 LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
@@ -102,7 +104,6 @@ GLOBAL_JS =\
 LOLEAFLET_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
-e "try {console.log(require('$(1)').getFiles().join(' '))} catch(e) {}"))
 
 PLUGINS_JS =\
-   leaflet.draw-src.js \
w2ui-1.5.rc1.js \
main.js \
toolbar.js
@@ -123,7 +124,6 @@ all-local: | node_modules \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
$(JQUERY_UI_DIST_IMAGES) \
-   $(LOLEAFLET_PREFIX)/dist/leaflet.draw-src.js \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/admin-bundle.js \
$(builddir)/dist/bundle.css \
@@ -131,21 +131,15 @@ all-local: | node_modules \
$(builddir)/dist/loleaflet.html
@echo "build loleaflet completed"
 
-$(LOLEAFLET_PREFIX)/dist/leaflet.draw-src.js: $(LOLEAFLET_DRAW_CSS_SRC) 
$(LOLEAFLET_DRAW_JS_SRC)
-   @mkdir -p $(dir $@)
-   @NODE_PATH=$(abs_builddir)/node_modules jake -f 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/Jakefile.js -C 
$(srcdir)/plugins/draw-$(DRAW_VERSION) build debug=$(ENABLE_DEBUG) 
minify=$(MINIFY) builddir=$(LOLEAFLET_PREFIX)
-if ENABLE_DEBUG
-   @cp $(LOLEAFLET_DRAW_CSS_SRC) $(builddir)/dist/
-endif
-   @cp -a $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist/images/* 
$(builddir)/dist/images/
-
 $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) $(BOOTSTRAP_DST) 
$(CURSORS_DST)
@NODE_PATH=$(abs_builddir)/node_modules jake -f $(srcdir)/Jakefile.js 
-C $(srcdir) $(abs_builddir)/dist/admin-bundle.js debug=$(ENABLE_DEBUG) 
minify=$(MINIFY) builddir=$(abs_builddir)
 
 if ENABLE_DEBUG
-$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
+$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) 
$(LOLEAFLET_DRAW_JS_DST)
@echo "Checking loleaflet for JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+   @cp -a $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist/images/* 
$(builddir)/dist/images/
+#  @$(NODE) node_modules/eslint/bin/eslint.js 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src --ignore-path 
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@touch $@
 
 $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
@@ -153,7 +147,6 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(LOLEAFLET_PREFIX)/dist/leaflet.draw-src.js \
$(builddir)/dist/global.js $(builddir)/dist/w2ui-1.5.rc1.js \
$(builddir)/dist/main.js $(builddir)/dist/toolbar.js
@touch $@
@@ -165,7 +158,9 @@ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: 
$(LOLEAFLET_JS_SRC)
@echo "Concatenating loleaflet files..."
@(cat $(srcdir)/src/copyright.js | sed 
's/{VERSION}/$(LOLEAFLET_VERSION)/' - \
&& echo "(function (window, document, undefined) {" \
-   && awk 'FNR == 1 {print ""} 1' $(patsubst 
%.js,$(srcdir)/%.js,$(call LOLEAFLET_JS,$(srcdir)/build/build.js)) \
+   && awk 'FNR == 1 {print ""} 1' \
+   $(patsubst %.js,$(srcdir)/%.js,$(call 
LOLEAFLET_JS,$(srcdir)/build/build.js)) \
+   $(patsubst 
%.js,$(srcdir)/plugins/draw-$(DRAW_VERSION)/%.js,$(call 
LOLEAFLET_JS,$(srcdir)/plugins/draw-$(DRAW_VERSION)/build/build.js)) \
&& echo "}(window, document));") > $@
 
 $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS)
@@ -174,7 +169,6 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-   $(LOLEAFLET_PREFIX)/dist/leaflet.draw-src.js \
$(srcdir)/js/global.js $(srcdir)/js/w2ui-1.5.rc1.js \
$(srcdir)/js/main.js $(srcdir)/js/toolbar.js
@echo "Uglify loleaflet js files..."
@@ -182,7 +176,6 @@

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

2018-05-11 Thread Andras Timar

 loleaflet/Makefile.am |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8f8fbd64dffab94914906da6d0288a4367bd5d12
Author: Andras Timar 
Date:   Fri May 11 16:38:47 2018 +0200

fix file paths 'make pot'

Change-Id: I135c05955e4b8752d527838162f4a7ed345fcc6d

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 68ea2131e..32eed4eda 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -256,8 +256,8 @@ pot:
xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
admin.strings.js \
evol.colorpicker.strings.js \
-   dist/errormessages.js \
-   dist/toolbar/toolbar.js \
+   src/errormessages.js \
+   js/toolbar.js \
src/admin/AdminSocketAnalytics.js \
src/admin/AdminSocketBase.js \
src/admin/AdminSocketOverview.js \
@@ -279,7 +279,7 @@ pot:
src/map/Map.js \
src/map/handler/Map.FileInserter.js
 
-   html2po --pot --input=dist/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot --duplicates=merge
+   html2po --pot --input=html/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot --duplicates=merge
 
 l10n: pot
for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-02-21 Thread Andras Timar

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

New commits:
commit 239d5a09a3454bd5dd13fd4a89400f5ed8d6d751
Author: Andras Timar 
Date:   Wed Feb 21 23:07:52 2018 +0100

remove src/control/Control.MetricInput.js from list of localizable files, 
because it was deleted

Change-Id: I1583c81aef924c7f61b6b1722666c5fd1137e418

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3f79dd3d..1e6fadae 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -56,7 +56,6 @@ pot:
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
-   src/control/Control.MetricInput.js \
src/control/Control.RowHeader.js \
src/control/Control.Scroll.Annotation.js \
src/control/Control.Tabs.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-31 Thread Samuel Mehrbrodt

 loleaflet/Makefile.am |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3ae85e20a66ac3871b3ebbbd36bfc8730d620124
Author: Samuel Mehrbrodt 
Date:   Tue Jan 30 14:54:42 2018 +0100

Ignore errors when draw directory is not deletable

Change-Id: Iec3567129f96b69174421ca1ec652dccf6a6b56c
Reviewed-on: https://gerrit.libreoffice.org/48911
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 495cd47d..3f79dd3d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | 
sed 's/.\///')
 
 all-local: node_modules $(L10N_JSON) $(JQUERY_UI_DIST_IMAGES)
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
-   rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
+   rm -rf dist/plugins/draw-$(DRAW_VERSION) || true
+   mkdir -p dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po loleaflet/src

2018-01-18 Thread Andras Timar

 loleaflet/Makefile.am|1 +
 loleaflet/po/templates/loleaflet-ui.pot  |   10 +-
 loleaflet/src/control/Control.AlertDialog.js |9 +
 3 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit a8f3876ea44c527f934573b3b9197dedb3b18d56
Author: Andras Timar 
Date:   Wed Jan 17 16:55:11 2018 +0100

enable l10n of Control.AlertDialog.js

Change-Id: I841aa6b7ef02fd6681fc55f16976a38de69c54b6
Reviewed-on: https://gerrit.libreoffice.org/48061
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 37e3064f..495cd47d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -50,6 +50,7 @@ pot:
src/admin/AdminSocketHistory.js \
src/admin/AdminSocketSettings.js \
src/admin/Util.js \
+   src/control/Control.AlertDialog.js \
src/control/Control.ColumnHeader.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 5a26ecdf..e3bcd7d8 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-16 15:32+0100\n"
+"POT-Creation-Date: 2018-01-17 16:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -551,6 +551,14 @@ msgstr ""
 msgid " s"
 msgstr ""
 
+#: src/control/Control.AlertDialog.js:28
+msgid "The server encountered a %0 error while parsing the %1 command."
+msgstr ""
+
+#: src/control/Control.AlertDialog.js:41
+msgid "Download PDF export?"
+msgstr ""
+
 #: src/control/Control.ContextMenu.js:129
 msgid "Internal Cut"
 msgstr ""
diff --git a/loleaflet/src/control/Control.AlertDialog.js 
b/loleaflet/src/control/Control.AlertDialog.js
index 4b937200..f91fceae 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -2,7 +2,7 @@
  * L.Control.Dialog used for displaying alerts
  */
 
-/* global vex */
+/* global _ vex */
 L.Control.AlertDialog = L.Control.extend({
onAdd: function (map) {
// TODO: Better distinction between warnings and errors
@@ -25,8 +25,9 @@ L.Control.AlertDialog = L.Control.extend({
// Handled by transparently retrying.
return;
} else if (e.cmd && e.kind) {
-   var msg = 'The server encountered a \'' + e.kind + '\' 
error while' +
-   ' parsing the \'' + e.cmd + '\' 
command.';
+   var msg = _('The server encountered a %0 error while 
parsing the %1 command.');
+   msg.replace('%0', e.kind);
+   msg.replace('%1', e.cmd);
vex.dialog.alert(msg);
}
 
@@ -37,7 +38,7 @@ L.Control.AlertDialog = L.Control.extend({
_onPrint: function (e) {
var url = e.url;
vex.dialog.confirm({
-   message: 'Download PDF export?',
+   message: _('Download PDF export?'),
callback: L.bind(function (value) {
if (value) {
this._map._fileDownloader.src = url;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-09 Thread Pranav Kant

 loleaflet/Makefile.am |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 66556c1668f2b8e11b28faffc62ee269e53d19dd
Author: Pranav Kant 
Date:   Fri Nov 10 11:30:06 2017 +0530

Copy jquery-ui image files to dist/ during normal make

No need of dist-hook now to do the same. The good thing is that now
these images will also be available to a developer which was earlier not
possible without manually copying the files left & right. This means no
more annoying errors in developer's browser console.

Change-Id: Ie180720086feace00b61891f56ee3532f5f9df7b

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index aa0492f0..07209238 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -14,9 +14,13 @@ L10N_JSON = $(patsubst po/%.po,dist/l10n/%.json,$(L10N_PO))
 L10N_STYLES_PO = $(wildcard po/styles/*.po)
 L10N_STYLES_JSON = $(patsubst 
po/styles/%.po,dist/l10n/styles/%.json,$(L10N_STYLES_PO))
 
+JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
+JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
+JQUERY_UI_DIST_IMAGES = $(patsubst 
$(JQUERY_UI_IMAGE_PATH)/%.png,dist/$(JQUERY_UI_IMAGE_PATH)/%.png,$(JQUERY_UI_IMAGES))
+
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
-all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
+all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON) 
$(JQUERY_UI_DIST_IMAGES)
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
@@ -25,6 +29,10 @@ node_modules: npm-shrinkwrap.json
npm install
touch node_modules
 
+dist/$(JQUERY_UI_IMAGE_PATH)/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png
+   mkdir -p dist/$(JQUERY_UI_IMAGE_PATH)
+   cp -a $(JQUERY_UI_IMAGE_PATH)/* dist/$(JQUERY_UI_IMAGE_PATH)/
+
 dist/l10n/%.json: po/%.po
@util/po2json.py $< -o $@
 
@@ -35,12 +43,6 @@ install-data-hook:
mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \
cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/;
 
-dist-hook:
-   chmod u+w $(distdir)/dist
-
-   mkdir -p 
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-   cp -a 
"node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png"
 $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-
 pot:
xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
admin.strings.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-02 Thread Christian Glombek

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

New commits:
commit b61bcd2e5381b9cc9615a2c7b1267620a58b3898
Author: Christian Glombek 
Date:   Fri Aug 25 09:08:13 2017 +0200

Fix build from non-git source archives like tar or zip

Change-Id: I359056c9ad2550b625eb3e7b8e71d841eedea93b
Reviewed-on: https://gerrit.libreoffice.org/41553
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index be4678fe..aa0492f0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -14,7 +14,7 @@ L10N_JSON = $(patsubst po/%.po,dist/l10n/%.json,$(L10N_PO))
 L10N_STYLES_PO = $(wildcard po/styles/*.po)
 L10N_STYLES_JSON = $(patsubst 
po/styles/%.po,dist/l10n/styles/%.json,$(L10N_STYLES_PO))
 
-EXTRA_DIST = $(shell git ls-files)
+EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
 all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/util

2017-07-31 Thread Andras Timar

 loleaflet/Makefile.am |5 +
 loleaflet/util/po2json.py |8 
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 0bfd359a7c366e0eef4b54802f0c9b457a70daed
Author: Andras Timar 
Date:   Mon Jul 10 15:00:40 2017 +0200

loleaflet: create destination file's directory with po2json.py

... because the Makefile did not work on SLED11SP4 (?!)

Change-Id: I4e7468149f1c5461aeeb05d3a68e62cda1e329e5
Reviewed-on: https://gerrit.libreoffice.org/39778
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 87c39079..be4678fe 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -28,10 +28,7 @@ node_modules: npm-shrinkwrap.json
 dist/l10n/%.json: po/%.po
@util/po2json.py $< -o $@
 
-dist/l10n/styles:
-   @mkdir -p $@
-
-dist/l10n/styles/%.json: po/styles/%.po dist/l10n/styles
+dist/l10n/styles/%.json: po/styles/%.po
@util/po2json.py $< -o $@
 
 install-data-hook:
diff --git a/loleaflet/util/po2json.py b/loleaflet/util/po2json.py
index 3769b7be..cfcb45e2 100755
--- a/loleaflet/util/po2json.py
+++ b/loleaflet/util/po2json.py
@@ -10,6 +10,7 @@ import polib
 import re
 import string
 import sys
+import errno
 
 parser = optparse.OptionParser(usage="usage: %prog [options] pofile...")
 parser.add_option("--quiet", action="store_false", default=True, 
dest="verbose", help="don't print status messages to stdout")
@@ -45,6 +46,13 @@ for srcfile in args:
 
xlate_map[entry.msgid] = entry.msgstr;
 
+   if not os.path.exists(os.path.dirname(destfile)):
+   try:
+   os.makedirs(os.path.dirname(destfile))
+   except OSError as exc: # Guard against race condition
+   if exc.errno != errno.EEXIST:
+   raise
+
dest = open(destfile, "w")
 
dest.write(json.dumps(xlate_map, sort_keys = True));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-27 Thread Jan Holesovsky

 loleaflet/Makefile.am |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fdb5f6f09f13ff2bddf5c3b2a8ace072b4774513
Author: Jan Holesovsky 
Date:   Thu Apr 27 09:58:18 2017 +0200

Build the translations even for the developers.

Change-Id: Ida8e705c500c9698afc32427815a5b12ab076ac9
Reviewed-on: https://gerrit.libreoffice.org/37018
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4a8bd92a..cb458d68 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -10,11 +10,15 @@ MINIFY=false
 
 EXTRA_DIST = $(shell git ls-files)
 
-all-local: node_modules
+all-local: node_modules build-l10n
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
 
+   mkdir -p dist/l10n/styles
+   mv po/*.json dist/l10n/
+   mv po/styles/*.json dist/l10n/styles/
+
 node_modules: npm-shrinkwrap.json
npm install
touch node_modules
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-20 Thread Andras Timar

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

New commits:
commit c38e5de273584a978764dd736967bd131034e319
Author: Andras Timar 
Date:   Thu Apr 20 10:58:25 2017 +0200

loleaflet: without quotes the target file name was truncated at 
'ui-bg_highlight-soft_'

Change-Id: I0f7ffb0babf4295a48e1684a24bb24a0fd7ab8f4
Reviewed-on: https://gerrit.libreoffice.org/36725
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a2d4a617..4a8bd92a 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -41,7 +41,7 @@ dist-hook: build-l10n
mv po/styles/*.json $(distdir)/dist/l10n/styles/
 
mkdir -p 
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-   cp -a 
node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png
 $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
+   cp -a 
"node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png"
 $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
 
 pot:
xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Andras Timar

 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit baa07c0997b86ff88e3fa53ac3c265ec9fe54acf
Author: Andras Timar 
Date:   Wed Apr 12 22:22:49 2017 +0200

loleaflet: src/control/Control.ContextMenu.js contains translatable strings

Change-Id: I4010eb296a1771f0e8fbfa5078b4847193cfc188
Reviewed-on: https://gerrit.libreoffice.org/36491
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cd5ac55f..0a1880ae 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -56,6 +56,7 @@ pot:
src/admin/Util.js \
src/control/Control.CharacterMap.js \
src/control/Control.ColumnHeader.js \
+   src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
src/control/Control.MetricInput.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po

2017-03-13 Thread Andras Timar

 loleaflet/Makefile.am   |5 
 loleaflet/po/templates/loleaflet-ui.pot |  597 ++--
 2 files changed, 344 insertions(+), 258 deletions(-)

New commits:
commit e5fbdb2cde635ab046e66d0bf7b3abbeea0cd472
Author: Andras Timar 
Date:   Mon Mar 13 13:03:00 2017 +0100

loleaflet: add new localizable files to Makefile.am and regenerate pot file

Change-Id: I6a91186eba13da6745c2cddb6e96b7b148d797dc

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index f47f495..cd5ac55 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -52,15 +52,20 @@ pot:
dist/toolbar/toolbar.js \
src/admin/AdminSocketBase.js \
src/admin/AdminSocketOverview.js \
+   src/admin/AdminSocketSettings.js \
src/admin/Util.js \
src/control/Control.CharacterMap.js \
src/control/Control.ColumnHeader.js \
src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
+   src/control/Control.MetricInput.js \
src/control/Control.RowHeader.js \
+   src/control/Control.Scroll.Annotation.js \
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
+   src/layer/marker/Annotation.js \
+   src/layer/tile/TileLayer.js \
src/map/Map.js \
src/map/handler/Map.FileInserter.js
 
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index f9d2985..df4123e 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 15:39+0100\n"
+"POT-Creation-Date: 2017-03-13 13:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -85,9 +85,9 @@ msgstr ""
 msgid "Graphs"
 msgstr ""
 
-#: admin.strings.js:22 dist/toolbar/toolbar.js:470
-#: src/control/Control.Menubar.js:11 src/control/Control.Menubar.js:164
-#: src/control/Control.Menubar.js:223
+#: admin.strings.js:22 dist/toolbar/toolbar.js:473
+#: src/control/Control.Menubar.js:11 src/control/Control.Menubar.js:175
+#: src/control/Control.Menubar.js:235
 msgid "Save"
 msgstr ""
 
@@ -293,374 +293,383 @@ msgstr ""
 msgid "0 users"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:261
+#: dist/toolbar/toolbar.js:264
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:461
+#: dist/toolbar/toolbar.js:464
 msgid "Textwrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:462
+#: dist/toolbar/toolbar.js:465
 msgid "No wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:463
+#: dist/toolbar/toolbar.js:466
 msgid "Page wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:464
+#: dist/toolbar/toolbar.js:467
 msgid "Wrap anchor only"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:465
+#: dist/toolbar/toolbar.js:468
 msgid "Ideal wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:466
+#: dist/toolbar/toolbar.js:469
 msgid "Left wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:467
+#: dist/toolbar/toolbar.js:470
 msgid "Right wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:468
+#: dist/toolbar/toolbar.js:471
 msgid "Wrap through"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:472 src/control/Control.Menubar.js:22
-#: src/control/Control.Menubar.js:174 src/control/Control.Menubar.js:233
+#: dist/toolbar/toolbar.js:475 src/control/Control.Menubar.js:22
+#: src/control/Control.Menubar.js:185 src/control/Control.Menubar.js:245
 msgid "Undo"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:473 src/control/Control.Menubar.js:23
-#: src/control/Control.Menubar.js:175 src/control/Control.Menubar.js:234
+#: dist/toolbar/toolbar.js:476 src/control/Control.Menubar.js:23
+#: src/control/Control.Menubar.js:186 src/control/Control.Menubar.js:246
 msgid "Redo"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:474
+#: dist/toolbar/toolbar.js:477
 msgid "Document repair"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:480 src/control/Control.Menubar.js:60
+#: dist/toolbar/toolbar.js:483 src/control/Control.Menubar.js:71
 msgid "Bold"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:481 src/control/Control.Menubar.js:61
+#: dist/toolbar/toolbar.js:484 src/control/Control.Menubar.js:72
 msgid "Italic"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:482 src/control/Control.Menubar.js:62
+#: dist/toolbar/toolbar.js:485 src/control/Control.Menubar.js:73
 msgid "Underline"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:483
+#: dist/toolbar/toolbar.js:486
 msgid "Strikeout"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:485
+#: dist/toolbar/toolbar.js:488
 msgid "Insert Footnote"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:488
+#: dist/toolbar/toolbar.js:491
 msgid "Font color"
 msgstr ""
 
-#:

[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po

2017-01-09 Thread Andras Timar

 loleaflet/Makefile.am |2 
 loleaflet/po/templates/loleaflet-help.pot |  745 --
 2 files changed, 123 insertions(+), 624 deletions(-)

New commits:
commit fdb71825c4c8351a12cd74ab5a2fa610961b278c
Author: Andras Timar 
Date:   Mon Jan 9 15:48:16 2017 +0100

loleaflet: use --duplicates=merge option of html2po

Change-Id: Id2bba4580910a7dd02c0a11302e4ae1dd2c15acb

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4e3ed35..f47f495 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -64,7 +64,7 @@ pot:
src/map/Map.js \
src/map/handler/Map.FileInserter.js
 
-   html2po --pot --input=dist/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot
+   html2po --pot --input=dist/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot --duplicates=merge
 
 l10n: pot
for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index 00ecfc5..889045d 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 12:59+0200\n"
+"POT-Creation-Date: 2017-01-09 15:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -69,37 +69,43 @@ msgid "Ctrl + Shift + ?"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.h2:38
-msgctxt "dist/loleaflet-help.html div.div.h2:38"
+#: dist/loleaflet-help.html+div.div.h2:160
 msgid "Text formatting"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:40
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40"
+#: dist/loleaflet-help.html+div.div.table.tr.td:137
+#: dist/loleaflet-help.html+div.div.table.tr.td:162
 msgid "Bold"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:40
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40"
+#: dist/loleaflet-help.html+div.div.table.tr.td:137
+#: dist/loleaflet-help.html+div.div.table.tr.td:162
 msgid "Ctrl + B"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:41
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41"
+#: dist/loleaflet-help.html+div.div.table.tr.td:138
+#: dist/loleaflet-help.html+div.div.table.tr.td:163
 msgid "Italic"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:41
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41"
+#: dist/loleaflet-help.html+div.div.table.tr.td:138
+#: dist/loleaflet-help.html+div.div.table.tr.td:163
 msgid "Ctrl + I"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:42
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42"
+#: dist/loleaflet-help.html+div.div.table.tr.td:139
+#: dist/loleaflet-help.html+div.div.table.tr.td:164
 msgid "Underline"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:42
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42"
+#: dist/loleaflet-help.html+div.div.table.tr.td:139
+#: dist/loleaflet-help.html+div.div.table.tr.td:164
 msgid "Ctrl + U"
 msgstr ""
 
@@ -108,92 +114,102 @@ msgid "Double Underline"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:43
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:43"
+#: dist/loleaflet-help.html+div.div.table.tr.td:144
 msgid "Ctrl + D"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:44
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44"
+#: dist/loleaflet-help.html+div.div.table.tr.td:140
+#: dist/loleaflet-help.html+div.div.table.tr.td:165
 msgid "Strikethrough"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:44
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44"
+#: dist/loleaflet-help.html+div.div.table.tr.td:140
+#: dist/loleaflet-help.html+div.div.table.tr.td:165
 msgid "Ctrl + Alt + 5"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:45
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45"
+#: dist/loleaflet-help.html+div.div.table.tr.td:166
 msgid "Superscript"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:45
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45"
+#: dist/loleaflet-help.html+div.div.table.tr.td:166
 msgid "Ctrl + Shift + P"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:46
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46"
+#: dist/loleaflet-help.html+div.div.table.tr.td:167
 msgid "Subscript"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:46
-msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46"
+#: dist/loleaflet-help.html+div.div.table.tr.td:167
 msgid "Ctrl + Shift + B"
 msgstr ""
 
 #: dist/loleaflet-help.html+div.div.table.tr.td:47
-msgctxt "dist/loleaflet-help.html

85 matches

Mail list logo