[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/AnnotationManagerImpress.js | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
New commits:
commit fdf3df407c535a7b33016e7d07dc71ea237cf09f
Author: Ezinne Nnamani
AuthorDate: Tue Sep 8 17:06:16 2020 +0100
Commit: Tomaž Vajngerl
CommitDate: Thu Sep 10 13:05:05 2020 +0200
A fix to handle the added "Reply to" when the user clicks on the comment in
Impress slide
Change-Id: Ib6cfa7acca208a143a237acb1c9b2753cbe6ca18
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102270
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/loleaflet/src/layer/AnnotationManagerImpress.js
b/loleaflet/src/layer/AnnotationManagerImpress.js
index 2e5945a9c..542f0572b 100644
--- a/loleaflet/src/layer/AnnotationManagerImpress.js
+++ b/loleaflet/src/layer/AnnotationManagerImpress.js
@@ -144,20 +144,10 @@ L.AnnotationManagerImpress =
L.AnnotationManagerBase.extend({
this._map.sendUnoCommand('.uno:DeleteAnnotation', comment);
this._map.focus();
},
- onAnnotationClick: function (e) {
- var comment = {
- Id: {
- type: 'string',
- value: e.annotation._data.id
- },
- Text: {
- type: 'string',
- value: e.annotation._data.reply
- }
- };
- this._map.sendUnoCommand('.uno:ReplyToAnnotation', comment);
- this._selectedAnnotation = undefined;
+ onAnnotationClick: function (event) {
+ this._selectedForPopup = event.annotation;
this._map.focus();
+ this.layoutAnnotations();
},
onAnnotationSave: function (event) {
var comment;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/layer/tile/ImpressTileLayer.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit a8cefd617ff203a0e35fe5143f97e69c461fa820
Author: Ezinne Nnamani
AuthorDate: Fri Sep 4 16:04:13 2020 +0100
Commit: Andras Timar
CommitDate: Tue Sep 8 13:13:52 2020 +0200
A fix to display the avatar on the comments in Impress slides
Change-Id: I1ba699d5e8583253ec9d14502629218d8714e5aa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102141
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102118
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index b4e77f167..577c078dc 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -405,6 +405,9 @@ L.ImpressTileLayer = L.TileLayer.extend({
_onMessage: function (textMsg, img) {
if (textMsg.startsWith('comment:')) {
var obj =
JSON.parse(textMsg.substring('comment:'.length + 1));
+ if (obj.comment.author in
this._map._viewInfoByUserName) {
+ obj.comment.avatar =
this._map._viewInfoByUserName[obj.comment.author].userextrainfo.avatar;
+ }
if (obj.comment.action === 'Add') {
if (!this._annotations[obj.comment.parthash]) {
this._annotations[obj.comment.parthash]
= [];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/ImpressTileLayer.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 581ccb502ff72ba9a0ef811356949e195fe9dfb5
Author: Ezinne Nnamani
AuthorDate: Fri Sep 4 16:04:13 2020 +0100
Commit: Andras Timar
CommitDate: Mon Sep 7 07:07:57 2020 +0200
A fix to display the avatar on the comments in Impress slides
Change-Id: I1ba699d5e8583253ec9d14502629218d8714e5aa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102141
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 15b6ef5e1..a8d8a2522 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -170,6 +170,9 @@ L.ImpressTileLayer = L.TileLayer.extend({
_onMessage: function (textMsg, img) {
if (textMsg.startsWith('comment:')) {
var object =
JSON.parse(textMsg.substring('comment:'.length + 1));
+ if (object.comment.author in
this._map._viewInfoByUserName) {
+ object.comment.avatar =
this._map._viewInfoByUserName[object.comment.author].userextrainfo.avatar;
+ }
this._annotationManager.processCommentMessage(object.comment);
} else {
L.TileLayer.prototype._onMessage.call(this, textMsg,
img);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - extras/source
extras/source/shellnew/soffice.odg |binary extras/source/shellnew/soffice.odp |binary extras/source/shellnew/soffice.ods |binary extras/source/shellnew/soffice.odt |binary 4 files changed New commits: commit a2a2a2ad6482952f403d271bea672e9cbf9bf95c Author: Ezinne Nnamani AuthorDate: Sat Aug 22 21:22:44 2020 +0100 Commit: Andras Timar CommitDate: Tue Aug 25 08:23:04 2020 +0200 tdf#133661 Modified soffice.odp/ods/odg files to empty bare minimal ODF files Change-Id: I91734d32719f1b68da1b1810dad5960c0bd807e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101195 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/extras/source/shellnew/soffice.odg b/extras/source/shellnew/soffice.odg index ac06d224ec84..49fa7436a8cd 100644 Binary files a/extras/source/shellnew/soffice.odg and b/extras/source/shellnew/soffice.odg differ diff --git a/extras/source/shellnew/soffice.odp b/extras/source/shellnew/soffice.odp index af729d5a3a11..f97540d868ce 100644 Binary files a/extras/source/shellnew/soffice.odp and b/extras/source/shellnew/soffice.odp differ diff --git a/extras/source/shellnew/soffice.ods b/extras/source/shellnew/soffice.ods index 33782b08fedf..acb7e250eb42 100644 Binary files a/extras/source/shellnew/soffice.ods and b/extras/source/shellnew/soffice.ods differ commit d21a388ab59b8b2be07d3f7d7f2b5f2ca9c05374 Author: Mike Kaganski AuthorDate: Tue Aug 18 12:00:05 2020 +0300 Commit: Andras Timar CommitDate: Tue Aug 25 08:22:51 2020 +0200 tdf#133661: make soffice.odt a bare minimal ODT, with no data at all Hopefully this would prevent in the future the sequences like what has happened in the past, when first 9fceed463ba6ab752ef49f40e628a98e21cf525e removed page dimensions, then 2a33c69b16cce539951a796d7afa45c13b097cf6 added them back when trying to provide better font defaults, and then 5d9348b13674baf1d27f406767274e764c758bd5 changed the dimensions from one standard to another... Of course, this is just a simple solution, still not allowing one to use custom templates when using ShellNew functionality. Change-Id: I7b48fedad8ba7f85f8cfdd0f98ccb505c51d1e76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100899 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/extras/source/shellnew/soffice.odt b/extras/source/shellnew/soffice.odt index be6efc69f714..d2a8dc274c6c 100644 Binary files a/extras/source/shellnew/soffice.odt and b/extras/source/shellnew/soffice.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/shellnew/soffice.odg |binary extras/source/shellnew/soffice.odp |binary extras/source/shellnew/soffice.ods |binary 3 files changed New commits: commit ba0f4652b6743b3de6d692f87f688238a0eee9ce Author: Ezinne Nnamani AuthorDate: Sat Aug 22 21:22:44 2020 +0100 Commit: Andras Timar CommitDate: Tue Aug 25 08:01:57 2020 +0200 tdf#133661 Modified soffice.odp/ods/odg files to empty bare minimal ODF files Change-Id: I91734d32719f1b68da1b1810dad5960c0bd807e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101195 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/extras/source/shellnew/soffice.odg b/extras/source/shellnew/soffice.odg index ac06d224ec84..49fa7436a8cd 100644 Binary files a/extras/source/shellnew/soffice.odg and b/extras/source/shellnew/soffice.odg differ diff --git a/extras/source/shellnew/soffice.odp b/extras/source/shellnew/soffice.odp index af729d5a3a11..f97540d868ce 100644 Binary files a/extras/source/shellnew/soffice.odp and b/extras/source/shellnew/soffice.odp differ diff --git a/extras/source/shellnew/soffice.ods b/extras/source/shellnew/soffice.ods index 33782b08fedf..acb7e250eb42 100644 Binary files a/extras/source/shellnew/soffice.ods and b/extras/source/shellnew/soffice.ods differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
