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

[Jan Holesovsky]

 loleaflet/src/layer/AnnotationManager.js |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7654d456cae669c01dcd40f1038998287ed752f4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jun 8 13:14:26 2017 +0200

    loleaflet: Need to distinguish between comments and redlines here.
    
    Change-Id: I3a3111dc6c98bbc0a3ab47e92619f95c0fc65516
    Reviewed-on: https://gerrit.libreoffice.org/38565
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/src/layer/AnnotationManager.js b/loleaflet/src/layer/AnnotationManager.js
index 4b6b3843..3764e631 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -510,7 +510,11 @@ L.AnnotationManager = L.Class.extend({
 		var id;
 		var changetrack = obj.redline ? true : false;
 		var action = changetrack ? obj.redline.action : obj.comment.action;
-		if (obj.comment.author in this._map._viewInfoByUser) {
+
+		if (changetrack && obj.redline.author in this._map._viewInfoByUser) {
+			obj.redline.avatar = this._map._viewInfoByUser[obj.redline.author].userextrainfo.avatar;
+		}
+		else if (!changetrack && obj.comment.author in this._map._viewInfoByUser) {
 			obj.comment.avatar = this._map._viewInfoByUser[obj.comment.author].userextrainfo.avatar;
 		}