summaryrefslogtreecommitdiff
path: root/src/static
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2016-03-26 22:11:22 +0800
committerJohn McLear <john@mclear.co.uk>2016-03-26 22:11:22 +0800
commit8df8228a36604ac4a090118aad6969a7b7823a08 (patch)
tree0fd66448a498b3305485cacdd6a9d7e5581837f0 /src/static
parentb698927474851efd25c4aa3d583c5af9293a37fe (diff)
parent9bcf8690c063bd572afff9d70d9fc0d64a0318db (diff)
downloadetherpad-lite-8df8228a36604ac4a090118aad6969a7b7823a08.zip
Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
Update author when removing line attribute from line
Diffstat (limited to 'src/static')
-rw-r--r--src/static/js/AttributeManager.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/static/js/AttributeManager.js b/src/static/js/AttributeManager.js
index d4d20a1f..e3749510 100644
--- a/src/static/js/AttributeManager.js
+++ b/src/static/js/AttributeManager.js
@@ -278,6 +278,9 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
if (attrib[0] === attributeName && (!attributeValue || attrib[0] === attributeValue)){
found = true;
return [attributeName, ''];
+ }else if (attrib[0] === 'author'){
+ // update last author to make changes to line attributes on this line
+ return [attributeName, this.author];
}
return attrib;
});