From a2e28e6e25fe82f63b1e181ba1517878cf8d86b7 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 10 Dec 2018 13:46:21 +0100 Subject: [PATCH] Fix missing avatar in cursor tooltip --- www/common/outer/cursor.js | 1 - www/common/sframe-common-codemirror.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/www/common/outer/cursor.js b/www/common/outer/cursor.js index 975a426c1..41615c175 100644 --- a/www/common/outer/cursor.js +++ b/www/common/outer/cursor.js @@ -163,7 +163,6 @@ define([ data.color = Util.find(ctx.store.proxy, ['settings', 'general', 'cursor', 'color']); data.name = ctx.store.proxy[Constants.displayNameKey] || Messages.anonymous; data.avatar = Util.find(ctx.store.proxy, ['profile', 'avatar']); - console.log(data.color); c.cursor = data; sendMyCursor(ctx, client); cb(); diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index 93d25f7f9..b7dfb531e 100644 --- a/www/common/sframe-common-codemirror.js +++ b/www/common/sframe-common-codemirror.js @@ -433,7 +433,7 @@ define([ $(el).css('background-color', cursor.color); } if (cursor.name) { - $(el).attr('title', cursor.name); + $(el).attr('title', makeTippy(cursor)); } marks[id] = editor.setBookmark(cursorPosS, { widget: el }); } else {