paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

subject/topic: Rename empty_subject_placeholder.

Browse Source
This commit is contained in:
Steve Howell
2016-08-26 19:47:53 -07:00
committed by Tim Abbott
parent a929c6a8ba
commit 51f35f2ff7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/compose.js
View File

@@ -10,7 +10,7 @@ var is_composing_message = false;
var user_acknowledged_all_everyone; var user_acknowledged_all_everyone;
var message_snapshot; var message_snapshot;
var empty_subject_placeholder = "(no topic)"; var empty_topic_placeholder = "(no topic)";
var uploads_domain = document.location.protocol + '//' + document.location.host; var uploads_domain = document.location.protocol + '//' + document.location.host;
var uploads_path = '/user_uploads'; var uploads_path = '/user_uploads';
@@ -305,15 +305,15 @@ exports.cancel = function () {
$(document).trigger($.Event('compose_canceled.zulip')); $(document).trigger($.Event('compose_canceled.zulip'));
}; };
exports.empty_subject_placeholder = function () { exports.empty_topic_placeholder = function () {
return empty_subject_placeholder; return empty_topic_placeholder;
}; };
function create_message_object() { function create_message_object() {
// Subjects are optional, and we provide a placeholder if one isn't given. // Subjects are optional, and we provide a placeholder if one isn't given.
var subject = compose.subject(); var subject = compose.subject();
if (subject === "") { if (subject === "") {
subject = compose.empty_subject_placeholder(); subject = compose.empty_topic_placeholder();
} }
var content = make_uploads_relative(compose.message_content()); var content = make_uploads_relative(compose.message_content());

4
static/js/message_edit.js
View File

@@ -177,7 +177,7 @@ function edit_message (row, raw_content) {
} }
currently_editing_messages[message.id] = edit_obj; currently_editing_messages[message.id] = edit_obj;
if ((message.type === 'stream' && message.subject === compose.empty_subject_placeholder()) || if ((message.type === 'stream' && message.subject === compose.empty_topic_placeholder()) ||
!can_edit_content) { !can_edit_content) {
edit_row.find(".message_edit_topic").focus(); edit_row.find(".message_edit_topic").focus();
} else { } else {
@@ -240,7 +240,7 @@ exports.start_topic_edit = function (recipient_row) {
var msg_id = rows.id_for_recipient_row(recipient_row); var msg_id = rows.id_for_recipient_row(recipient_row);
var message = current_msg_list.get(msg_id); var message = current_msg_list.get(msg_id);
var topic = message.subject; var topic = message.subject;
if (topic === compose.empty_subject_placeholder()) { if (topic === compose.empty_topic_placeholder()) {
topic = ''; topic = '';
} }
form.find(".message_edit_topic").val(topic).select().focus(); form.find(".message_edit_topic").val(topic).select().focus();

2
static/js/message_store.js
View File

@@ -110,7 +110,7 @@ function set_topic_edit_properties(message) {
// Messages with no topics should always have an edit icon visible // Messages with no topics should always have an edit icon visible
// to encourage updating them. Admins can also edit any topic. // to encourage updating them. Admins can also edit any topic.
if (message.subject === compose.empty_subject_placeholder()) { if (message.subject === compose.empty_topic_placeholder()) {
message.always_visible_topic_edit = true; message.always_visible_topic_edit = true;
} else if (page_params.is_admin) { } else if (page_params.is_admin) {
message.on_hover_topic_edit = true; message.on_hover_topic_edit = true;