loleaflet/src/layer/AnnotationManager.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 637eecb9486dbe7b7457a7eccfab8ef3a9cd070e
Author: Jan Holesovsky <ke...@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/38566
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/layer/AnnotationManager.js
b/loleaflet/src/layer/AnnotationManager.js
index 0c5ffb26..06513ba9 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -525,7 +525,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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
