[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 11 11:38:02 UTC 2020


 loleaflet/src/layer/tile/CalcTileLayer.js |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7fe69e2c193c4f7fd736f1a7e69b78e806cfc97e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Aug 10 14:43:44 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Aug 11 13:37:43 2020 +0200

    Show availible user avatars in comments in calc
    
    Shows only for users which are present in the session
    as oly for them we have available data.
    
    Change-Id: I26b7c7f4358873216dba9fbf69a2608b1bf0803f
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100430
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 1e82f2598..c636d04ca 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -465,6 +465,9 @@ L.CalcTileLayer = L.TileLayer.extend({
 			for (var index in values.comments) {
 				comment = values.comments[index];
 				comment.tab = parseInt(comment.tab);
+				if (comment.author in this._map._viewInfoByUserName) {
+					comment.avatar = this._map._viewInfoByUserName[comment.author].userextrainfo.avatar;
+				}
 				comment.cellPos = L.LOUtil.stringToBounds(comment.cellPos);
 				comment.cellPos = L.latLngBounds(this._twipsToLatLng(comment.cellPos.getBottomLeft()),
 					this._twipsToLatLng(comment.cellPos.getTopRight()));


More information about the Libreoffice-commits mailing list