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

message edit: Change the empty topic placeholder to be the original topic. 

If a user removes the topic in the message edit form, we use the original
topic, not the empty topic.
This commit is contained in:
Rishi Gupta 2016-12-27 17:59:59 -08:00 committed by Tim Abbott
parent d8caf16e59
commit 83392bf974
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/message_edit.js
View File

@ -180,7 +180,6 @@ function edit_message(row, raw_content) {
is_editable: is_editable, is_editable: is_editable,
has_been_editable: (editability !== editability_types.NO), has_been_editable: (editability !== editability_types.NO),
topic: message.subject, topic: message.subject,
empty_topic_placeholder: compose.empty_topic_placeholder(),
content: raw_content, content: raw_content,
minutes_to_edit: Math.floor(page_params.realm_message_content_edit_limit_seconds / 60)})); minutes_to_edit: Math.floor(page_params.realm_message_content_edit_limit_seconds / 60)}));

2
static/templates/message_edit_form.handlebars
View File

@ -5,7 +5,7 @@
<div class="control-group no-margin"> <div class="control-group no-margin">
<label class="control-label edit-control-label" for="message_edit_topic">{{t "Topic" }}</label> <label class="control-label edit-control-label" for="message_edit_topic">{{t "Topic" }}</label>
<div class="controls edit-controls"> <div class="controls edit-controls">
<input type="text" placeholder="{{empty_topic_placeholder}}" value="{{topic}}" class="message_edit_topic" id="message_edit_topic" /> <input type="text" placeholder="{{topic}}" value="{{topic}}" class="message_edit_topic" id="message_edit_topic" />
<select class='message_edit_topic_propagate' style='display:none;'> <select class='message_edit_topic_propagate' style='display:none;'>
<option selected="selected" value="change_one"> {{t "Change only this message topic" }}</option> <option selected="selected" value="change_one"> {{t "Change only this message topic" }}</option>
<option value="change_later"> {{t "Change later messages to this topic" }}</option> <option value="change_later"> {{t "Change later messages to this topic" }}</option>