blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into soon

Browse source
This commit is contained in:
ansuz 2020-04-22 15:14:37 -04:00
commit 0a97ae8c52
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
www/code/inner.js
View file

@ -452,6 +452,7 @@ define([
markers.ready(); markers.ready();
common.getPadMetadata(null, function (md) { common.getPadMetadata(null, function (md) {
if (md && md.error) { return; } if (md && md.error) { return; }
if (!Array.isArray(md.owners)) { return void markers.setState(false); }
if (!common.isOwned(md.owners)) { return; } if (!common.isOwned(md.owners)) { return; }
// We're the owner: add the button and enable the colors if needed // We're the owner: add the button and enable the colors if needed
mkColorByAuthor(framework, markers); mkColorByAuthor(framework, markers);

4
www/code/markers.js
View file

@ -46,7 +46,7 @@ define([
inclusiveRight: uid === Env.myAuthorId, inclusiveRight: uid === Env.myAuthorId,
css: "background-color: " + rgba, css: "background-color: " + rgba,
attributes: { attributes: {
title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : undefined, title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : '',
'data-type': 'authormark', 'data-type': 'authormark',
'data-uid': uid 'data-uid': uid
} }
@ -689,7 +689,7 @@ define([
Markers.create = function (config) { Markers.create = function (config) {
var Env = config; var Env = config;
Env.authormarks = Util.clone(DEFAULT); Env.authormarks = {};
Env.enabled = false; Env.enabled = false;
Env.myAuthorId = 0; Env.myAuthorId = 0;