infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Restore a comment with undo

pull/1/head
yflory 2020-04-24 11:16:56 +02:00
parent 8e4ede3bb8
commit 45d3c1304f
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/pad/comment.js
View File

@ -14,9 +14,6 @@
var color2 = 'rgba(252, 231, 3, 0.8)';
CKEDITOR.plugins.add('comments', {
//requires: 'dialog,widget',
//icons: 'image',
//hidpi: true,
onLoad: function () {
CKEDITOR.addCss('comment { background-color: '+color1+'; }' +
'@keyframes color { 0% { background-color: '+color2+'; } 50% { background-color: '+color1+'; } 100% { background-color: '+color2+'; } }' +
@ -94,7 +91,12 @@
range.setStart(node, 0);
range.setEnd(node, Number.MAX_SAFE_INTEGER);
// Remove style for the comment
style.removeFromRange(range, editor);
console.log(range);
try {
style.removeFromRange(range, editor);
} catch (e) {
console.error(e);
}
});
setTimeout( function() {

25
www/pad/comments.js
View File

@ -270,8 +270,6 @@ define([
}, function () {
// Delete the comment
delete Env.comments.data[key];
var els = Env.$inner.find('comment[data-uid="'+key+'"]').toArray();
Env.editor.plugins.comments.uncomment(key, els);
// Send to chainpad
updateMetadata(Env);
@ -354,6 +352,7 @@ define([
var changed = false;
// Get the comments from the document
var toUncomment = {};
var uids = Env.$inner.find('comment').map(function (i, el) {
var id = el.getAttribute('data-uid');
// Empty comment: remove from dom
@ -363,22 +362,36 @@ define([
return;
}
// Comment not in the metadata: uncomment (probably an undo)
if (comments.indexOf(id) === -1) {
Env.editor.plugins.comments.uncomment(id, [el]);
var obj = Env.comments.data[id];
if (!obj) {
toUncomment[id] = toUncomment[id] || [];
toUncomment[id].push(el);
changed = true;
return;
}
// If this comment was deleted, we're probably using "undo" to restore it:
// remove the "deleted" state and continue
if (obj.deleted) {
delete obj.deleted;
changed = true;
}
return id;
}).toArray();
if (Object.keys(toUncomment).length) {
Object.keys(toUncomment).forEach(function (id) {
Env.editor.plugins.comments.uncomment(id, toUncomment[id]);
});
}
// Check if a comment has been deleted
comments.forEach(function (uid) {
if (uids.indexOf(uid) !== -1) { return; }
// comment has been deleted
var data = Env.comments.data[uid];
if (!data) { return; }
//data.deleted = true;
delete Env.comments.data[uid];
data.deleted = true;
//delete Env.comments.data[uid];
changed = true;
});