web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into cursor

Browse Source
This commit is contained in:
yflory 2018-12-10 13:46:27 +01:00
commit 32fc941141
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/outer/cursor.js
View File

@ -163,7 +163,6 @@ define([
data.color = Util.find(ctx.store.proxy, ['settings', 'general', 'cursor', 'color']); data.color = Util.find(ctx.store.proxy, ['settings', 'general', 'cursor', 'color']);
data.name = ctx.store.proxy[Constants.displayNameKey] || Messages.anonymous; data.name = ctx.store.proxy[Constants.displayNameKey] || Messages.anonymous;
data.avatar = Util.find(ctx.store.proxy, ['profile', 'avatar']); data.avatar = Util.find(ctx.store.proxy, ['profile', 'avatar']);
console.log(data.color);
c.cursor = data; c.cursor = data;
sendMyCursor(ctx, client); sendMyCursor(ctx, client);
cb(); cb();

2
www/common/sframe-common-codemirror.js
View File

@ -433,7 +433,7 @@ define([
$(el).css('background-color', cursor.color); $(el).css('background-color', cursor.color);
} }
if (cursor.name) { if (cursor.name) {
$(el).attr('title', cursor.name); $(el).attr('title', makeTippy(cursor));
} }
marks[id] = editor.setBookmark(cursorPosS, { widget: el }); marks[id] = editor.setBookmark(cursorPosS, { widget: el });
} else { } else {