mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 13:38:32 +01:00
Code Issues Projects Releases Wiki Activity

MDL-76635 comment: render the delete icon in the right place

Browse Source 
Special thanks to Andrew Lyons.
This commit is contained in:
Simey Lameze 2023-06-09 13:16:55 +08:00
parent d79788245b
commit 9382d66b4a
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
comment/comment.js
View File

@ -82,7 +82,7 @@ M.core_comment = {
action: 'add', action: 'add',
scope: scope, scope: scope,
params: params, params: params,
callback: function(id, obj, args) { callback: async function(id, obj, args) {
var scope = args.scope; var scope = args.scope;
var cid = scope.client_id; var cid = scope.client_id;
var ta = Y.one('#dlg-content-'+cid); var ta = Y.one('#dlg-content-'+cid);
@ -91,7 +91,7 @@ M.core_comment = {
ta.setStyle('backgroundImage', 'none'); ta.setStyle('backgroundImage', 'none');
scope.toggle_textarea(false); scope.toggle_textarea(false);
var container = Y.one('#comment-list-'+cid); var container = Y.one('#comment-list-'+cid);
var result = scope.render([obj], true); var result = await scope.render([obj], true);
var newcomment = Y.Node.create(result.html); var newcomment = Y.Node.create(result.html);
container.appendChild(newcomment); container.appendChild(newcomment);
var ids = result.ids; var ids = result.ids;
@ -178,7 +178,7 @@ M.core_comment = {
this.wait(); this.wait();
} }
}, },
render: function(list, newcmt) { render: async function(list, newcmt) {
var ret = {}; var ret = {};
ret.ids = []; ret.ids = [];
var template = Y.one('#cmt-tmpl'); var template = Y.one('#cmt-tmpl');
@ -191,18 +191,9 @@ M.core_comment = {
} else { } else {
val = val.replace('___name___', list[i].fullname); val = val.replace('___name___', list[i].fullname);
} }
if (list[i]['delete']||newcmt) { if (list[i].delete || newcmt) {
var tokens = { list[i].clientid = this.client_id;
user: list[i].fullname, list[i].content += await this.renderDeleteIcon(list[i]);
time: list[i].time
};
var deleteStr = Y.Escape.html(M.util.get_string('deletecommentbyon', 'moodle', tokens));
list[i].content = '<div class="comment-delete">' +
'<a href="#" role="button" id ="comment-delete-' + this.client_id + '-' + list[i].id + '"' +
' title="' + deleteStr + '">' +
'<span></span>' +
'</a>' +
'</div>' + list[i].content;
} }
val = val.replace('___time___', list[i].time); val = val.replace('___time___', list[i].time);
val = val.replace('___picture___', list[i].avatar); val = val.replace('___picture___', list[i].avatar);
@ -214,6 +205,34 @@ M.core_comment = {
ret.html = html; ret.html = html;
return ret; return ret;
}, },
renderDeleteIcon: async function(list) {
return new Promise(function(resolve) {
require(['core/templates', 'core/str'], (Templates, Str) => {
return Str.get_string('deletecommentbyon', 'moodle', {
user: list.fullname,
time: list.time
}).then(function(deleteStr) {
return Templates.renderPix('t/delete', 'core', deleteStr).then(function(deleteIcon) {
var deleteDiv = document.createElement('div');
deleteDiv.className = 'comment-delete';
var deleteLink = document.createElement('a');
deleteLink.href = '#';
deleteLink.role = 'button';
deleteLink.title = deleteStr;
deleteLink.id = `comment-delete-${list.clientid}-${list.id}`;
deleteLink.innerHTML = deleteIcon;
deleteDiv.appendChild(deleteLink);
resolve(deleteDiv.outerHTML);
return true;
});
});
});
});
},
load: function(page) { load: function(page) {
var scope = this; var scope = this;
var container = Y.one('#comment-ctrl-'+this.client_id); var container = Y.one('#comment-ctrl-'+this.client_id);
@ -224,7 +243,7 @@ M.core_comment = {
this.request({ this.request({
scope: scope, scope: scope,
params: params, params: params,
callback: function(id, ret, args) { callback: async function(id, ret, args) {
var linkText = Y.one('#comment-link-text-' + scope.client_id); var linkText = Y.one('#comment-link-text-' + scope.client_id);
if (ret.count && linkText) { if (ret.count && linkText) {
linkText.set('innerHTML', M.util.get_string('commentscount', 'moodle', ret.count)); linkText.set('innerHTML', M.util.get_string('commentscount', 'moodle', ret.count));
@ -241,7 +260,7 @@ M.core_comment = {
var result = {}; var result = {};
result.html = M.util.get_string('commentsrequirelogin', 'moodle'); result.html = M.util.get_string('commentsrequirelogin', 'moodle');
} else { } else {
var result = scope.render(ret.list); var result = await scope.render(ret.list);
} }
container.set('innerHTML', result.html); container.set('innerHTML', result.html);
var img = Y.one('#comment-img-'+scope.client_id); var img = Y.one('#comment-img-'+scope.client_id);
@ -332,13 +351,6 @@ M.core_comment = {
} }
}, '13,32'); }, '13,32');
// 13 and 32 are the keycodes for space and enter. // 13 and 32 are the keycodes for space and enter.
require(['core/templates', 'core/notification'], function(Templates, Notification) {
var title = node.getAttribute('title');
Templates.renderPix('t/delete', 'core', title).then(function(html) {
node.set('innerHTML', html);
}).catch(Notification.exception);
});
} }
); );
}, },

2
comment/lib.php
View File

@ -932,7 +932,7 @@ class comment {
$deletelink .= html_writer::start_tag('a', array('href' => '#', 'id' => 'comment-delete-'.$this->cid.'-'.$cmt->id, $deletelink .= html_writer::start_tag('a', array('href' => '#', 'id' => 'comment-delete-'.$this->cid.'-'.$cmt->id,
'class' => 'icon-no-margin', 'title' => $strdelete)); 'class' => 'icon-no-margin', 'title' => $strdelete));
$deletelink .= $OUTPUT->pix_icon('t/delete', get_string('delete')); $deletelink .= $OUTPUT->pix_icon('t/delete', $strdelete);
$deletelink .= html_writer::end_tag('a'); $deletelink .= html_writer::end_tag('a');
$deletelink .= html_writer::end_tag('div'); $deletelink .= html_writer::end_tag('div');
$cmt->content = $deletelink . $cmt->content; $cmt->content = $deletelink . $cmt->content;