paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_edit: Move some setup code closer to where it's used.

Browse Source 
This has no functional changes.
This commit is contained in:
Tim Abbott
2016-10-22 18:19:16 -07:00
parent ebc8bfa6ca
commit 2b58fa0a19
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
static/js/message_edit.js
View File

@@ -102,19 +102,6 @@ function edit_message (row, raw_content) {
.getBoundingClientRect().top; .getBoundingClientRect().top;
var message = current_msg_list.get(rows.id(row)); var message = current_msg_list.get(rows.id(row));
var edit_row = row.find(".message_edit");
var form = $(templates.render('message_edit_form',
{is_stream: (message.type === 'stream'),
topic: message.subject,
content: raw_content,
minutes_to_edit: Math.floor(page_params.realm_message_content_edit_limit_seconds / 60)}));
var edit_obj = {form: form, raw_content: raw_content};
var original_topic = message.subject;
current_msg_list.show_edit_message(row, edit_obj);
form.keydown(_.partial(handle_edit_keydown, false));
// We potentially got to this function by clicking a button that implied the // We potentially got to this function by clicking a button that implied the
// user would be able to edit their message. Give a little bit of buffer in // user would be able to edit their message. Give a little bit of buffer in
@@ -131,6 +118,20 @@ function edit_message (row, raw_content) {
now.diffSeconds(message.timestamp * 1000); now.diffSeconds(message.timestamp * 1000);
var can_edit_content = (page_params.realm_message_content_edit_limit_seconds === 0) || var can_edit_content = (page_params.realm_message_content_edit_limit_seconds === 0) ||
(seconds_left + seconds_left_buffer > 0); (seconds_left + seconds_left_buffer > 0);
var form = $(templates.render('message_edit_form',
{is_stream: (message.type === 'stream'),
topic: message.subject,
content: raw_content,
minutes_to_edit: Math.floor(page_params.realm_message_content_edit_limit_seconds / 60)}));
var edit_obj = {form: form, raw_content: raw_content};
var original_topic = message.subject;
current_msg_list.show_edit_message(row, edit_obj);
form.keydown(_.partial(handle_edit_keydown, false));
if (!can_edit_content) { if (!can_edit_content) {
row.find('textarea.message_edit_content').attr("disabled","disabled"); row.find('textarea.message_edit_content').attr("disabled","disabled");
} }
@@ -183,6 +184,7 @@ function edit_message (row, raw_content) {
} }
} }
var edit_row = row.find(".message_edit");
currently_editing_messages[message.id] = edit_obj; currently_editing_messages[message.id] = edit_obj;
if ((message.type === 'stream' && message.subject === compose.empty_topic_placeholder()) || if ((message.type === 'stream' && message.subject === compose.empty_topic_placeholder()) ||
!can_edit_content) { !can_edit_content) {