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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 12 11:23:43 UTC 2020


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

New commits:
commit ad13235f446368a3150efdedb42659429116e07b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Aug 12 10:16:54 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Aug 12 13:23:25 2020 +0200

    Show avatar for newly inserted comments in calc
    
    Change-Id: If602901982e8084856ca5361ab256a93e1045e45
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100581
    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 c636d04ca..4bf197b85 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -237,6 +237,9 @@ L.CalcTileLayer = L.TileLayer.extend({
 			var obj = JSON.parse(textMsg.substring('comment:'.length + 1));
 			obj.comment.tab = parseInt(obj.comment.tab);
 			if (obj.comment.action === 'Add') {
+				if (obj.comment.author in this._map._viewInfoByUserName) {
+					obj.comment.avatar = this._map._viewInfoByUserName[obj.comment.author].userextrainfo.avatar;
+				}
 				obj.comment.cellPos = L.LOUtil.stringToBounds(obj.comment.cellPos);
 				obj.comment.cellPos = L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),
 					this._twipsToLatLng(obj.comment.cellPos.getTopRight()));


More information about the Libreoffice-commits mailing list