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

Use rgba instead of #RRGGBBAA for the author markers

Browse Source
This commit is contained in:
yflory
2020-04-16 10:36:51 +02:00
parent 7890342ae1
commit 9c5f0c0d6f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/code/markers.js
+4 -2
View File
@@ -6,7 +6,7 @@ define([
], function (Util, SFCodeMirror, Messages, ChainPad) { ], function (Util, SFCodeMirror, Messages, ChainPad) {
var Markers = {}; var Markers = {};
var MARK_OPACITY = 90; var MARK_OPACITY = 0.5;
Messages.cba_writtenBy = 'Written by <em>{0}</em>'; // XXX Messages.cba_writtenBy = 'Written by <em>{0}</em>'; // XXX
@@ -15,10 +15,12 @@ define([
var author = Env.authormarks.authors[uid] || {}; var author = Env.authormarks.authors[uid] || {};
uid = Number(uid); uid = Number(uid);
var name = Util.fixHTML(author.name || Messages.anonymous); var name = Util.fixHTML(author.name || Messages.anonymous);
var col = Util.hexToRGB(author.color);
var rgba = 'rgba('+col[0]+','+col[1]+','+col[2]+','+Env.opacity+');';
return Env.editor.markText(from, to, { return Env.editor.markText(from, to, {
inclusiveLeft: uid === Env.myAuthorId, inclusiveLeft: uid === Env.myAuthorId,
inclusiveRight: uid === Env.myAuthorId, inclusiveRight: uid === Env.myAuthorId,
css: "background-color: " + author.color + Env.opacity, css: "background-color: " + rgba,
attributes: { attributes: {
title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : undefined, title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : undefined,
'data-type': 'authormark', 'data-type': 'authormark',