Merge branch 'staging' into cursor
This commit is contained in:
commit
32fc941141
2 changed files with 1 additions and 2 deletions
|
@ -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();
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue