Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

message_controls: Use a template instead of passing html as a string. 

This commit adds a handlebar template for the View source/Edit message
button in message controls in the message view.

This change also fixes the broken html titles that were added in
commit fdbab54614, and adds proper
internationalization for the title text.
This commit is contained in:
Vinit Singh 2020-07-25 18:05:56 +05:30 committed by Tim Abbott
parent e9203d92bb
commit 1f54918c8a
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
static/js/ui_init.js
View File

@ -2,6 +2,7 @@ const _ = require("lodash");
const generated_emoji_codes = require("../generated/emoji/emoji_codes.json");
const emoji = require("../shared/js/emoji");
const render_edit_content_button = require("../templates/edit_content_button.hbs");
const emojisets = require("./emojisets");
const markdown_config = require("./markdown_config");
@ -42,24 +43,13 @@ function message_hover(message_row) {
}
// But the message edit hover icon is determined by whether the message is still editable
if (
message_edit.get_editability(message) === message_edit.editability_types.FULL &&
!message.status_message
) {
message_row
.find(".edit_content")
.html(
'<i class="fa fa-pencil edit_content_button" aria-hidden="true" title="{{ _("Edit") }} (e)"></i>',
);
} else {
message_row
.find(".edit_content")
.html(
'<i class="fa fa-file-code-o edit_content_button" aria-hidden="true" title="{{ _("View source") }} (e)" data-message-id="' +
id +
'"></i>',
);
}
const is_message_editable =
message_edit.get_editability(message) === message_edit.editability_types.FULL;
const args = {
is_editable: is_message_editable && !message.status_message,
msg_id: id,
};
message_row.find(".edit_content").html(render_edit_content_button(args));
}
exports.initialize_kitchen_sink_stuff = function () {

5
static/templates/edit_content_button.hbs Normal file
View File

@ -0,0 +1,5 @@
{{#if is_editable}}
<i class="fa fa-pencil edit_content_button" aria-hidden="true" title="{{t "Edit" }} (e)"></i>
{{else}}
<i class="fa fa-file-code-o edit_content_button" aria-hidden="true" title="{{t "View source" }} (e)" data-message-id="{{msg_id}}"></i>
{{/if}}