[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
Ezinne Nnamani (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 8 11:14:12 UTC 2020
loleaflet/src/layer/tile/ImpressTileLayer.js | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit a8cefd617ff203a0e35fe5143f97e69c461fa820
Author: Ezinne Nnamani <nnamani.ezinne at collabora.com>
AuthorDate: Fri Sep 4 16:04:13 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
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 <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
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] = [];
More information about the Libreoffice-commits
mailing list