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

message_edit: Cleanup unnecessary 2-layer nesting.

Browse Source
This commit is contained in:
Tim Abbott
2016-10-22 18:35:42 -07:00
parent 5b3caa4d18
commit bd416c0425
1 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
static/js/message_edit.js
View File

@@ -157,41 +157,42 @@ function edit_message (row, raw_content) {
}); });
} }
if (page_params.realm_message_content_edit_limit_seconds > 0) { // add timer
if (can_edit_content &&
page_params.realm_message_content_edit_limit_seconds > 0) {
var timer_row = row.find('.message_edit_countdown_timer'); var timer_row = row.find('.message_edit_countdown_timer');
if (can_edit_content) { // Add a visual timer
// I believe these need to be defined outside the countdown_timer, since // I believe these need to be defined outside the countdown_timer, since
// row just refers to something like the currently selected message, and // row just refers to something like the currently selected message, and
// can change out from under us // can change out from under us
var message_content_row = row.find('textarea.message_edit_content'); var message_content_row = row.find('textarea.message_edit_content');
var message_topic_row, message_topic_propagate_row; var message_topic_row, message_topic_propagate_row;
if (message.type === 'stream') { if (message.type === 'stream') {
message_topic_row = row.find('input.message_edit_topic'); message_topic_row = row.find('input.message_edit_topic');
message_topic_propagate_row = row.find('select.message_edit_topic_propagate'); message_topic_propagate_row = row.find('select.message_edit_topic_propagate');
}
var message_save_row = row.find('button.message_edit_save');
// Do this right away, rather than waiting for the timer to do its first update,
// since otherwise there is a noticeable lag
timer_row.text(timer_text(seconds_left));
var countdown_timer = setInterval(function () {
if (--seconds_left <= 0) {
clearInterval(countdown_timer);
message_content_row.attr("disabled","disabled");
if (message.type === 'stream') {
message_topic_row.attr("disabled","disabled");
message_topic_propagate_row.hide();
}
// We don't go directly to "Topic editing only" state (with an active Save button),
// since it isn't clear what to do with the half-finished edit. It's nice to keep
// the half-finished edit around so that they can copy-paste it, but we don't want
// people to think "Save" will save the half-finished edit.
message_save_row.addClass("disabled");
timer_row.text(i18n.t("Time's up!"));
} else {
timer_row.text(timer_text(seconds_left));
}
}, 1000);
} }
var message_save_row = row.find('button.message_edit_save');
// Do this right away, rather than waiting for the timer to do its first update,
// since otherwise there is a noticeable lag
timer_row.text(timer_text(seconds_left));
var countdown_timer = setInterval(function () {
if (--seconds_left <= 0) {
clearInterval(countdown_timer);
message_content_row.attr("disabled","disabled");
if (message.type === 'stream') {
message_topic_row.attr("disabled","disabled");
message_topic_propagate_row.hide();
}
// We don't go directly to "Topic editing only" state (with an active Save button),
// since it isn't clear what to do with the half-finished edit. It's nice to keep
// the half-finished edit around so that they can copy-paste it, but we don't want
// people to think "Save" will save the half-finished edit.
message_save_row.addClass("disabled");
timer_row.text(i18n.t("Time's up!"));
} else {
timer_row.text(timer_text(seconds_left));
}
}, 1000);
} }
var edit_row = row.find(".message_edit"); var edit_row = row.find(".message_edit");