Merge branch 'master' into soon
commit
0a97ae8c52
|
@ -452,6 +452,7 @@ define([
|
|||
markers.ready();
|
||||
common.getPadMetadata(null, function (md) {
|
||||
if (md && md.error) { return; }
|
||||
if (!Array.isArray(md.owners)) { return void markers.setState(false); }
|
||||
if (!common.isOwned(md.owners)) { return; }
|
||||
// We're the owner: add the button and enable the colors if needed
|
||||
mkColorByAuthor(framework, markers);
|
||||
|
|
|
@ -46,7 +46,7 @@ define([
|
|||
inclusiveRight: uid === Env.myAuthorId,
|
||||
css: "background-color: " + rgba,
|
||||
attributes: {
|
||||
title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : undefined,
|
||||
title: Env.opacity ? Messages._getKey('cba_writtenBy', [name]) : '',
|
||||
'data-type': 'authormark',
|
||||
'data-uid': uid
|
||||
}
|
||||
|
@ -689,7 +689,7 @@ define([
|
|||
|
||||
Markers.create = function (config) {
|
||||
var Env = config;
|
||||
Env.authormarks = Util.clone(DEFAULT);
|
||||
Env.authormarks = {};
|
||||
Env.enabled = false;
|
||||
Env.myAuthorId = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue