Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

condense: Only apply a manual length choice while a message is long.

Aadyot14dcc7afdf473
diff --git a/web/src/condense.ts b/web/src/condense.ts
index ecc350a2198..5cee4c3f171 100644
--- a/web/src/condense.ts
+++ b/web/src/condense.ts
@@ -95,7 +95,11 @@ export function update_collapsed_view(message: Message): void {
$content.removeClass("collapsed");
- if (message.condensed === true) {
+ if (!$content.hasClass("could-be-condensed")) {
+ // A short message needs no [More] link, whatever the user chose.
+ $content.removeClass("condensed");
+ hide_message_length_toggle($row);
+ } else if (message.condensed === true) {
// This message was condensed by the user, so re-show the
// "Show more" button.
condense_row($row);
@@ -103,12 +107,9 @@ export function update_collapsed_view(message: Message): void {
// This message was un-condensed by the user, so re-show the
// "Show less" button.
uncondense_row($row);
- } else if ($content.hasClass("could-be-condensed")) {
+ } else {
// By default, condense a long message.
condense_row($row);
- } else {
- // This was a short message, no more need for a [More] link.
- hide_message_length_toggle($row);
}
}
}
@@ -276,12 +277,13 @@ export function condense_and_collapse(elems: JQuery): void {
// If message.condensed is defined, then the user has manually
// specified whether this message should be expanded or condensed.
- if (message.condensed === true) {
+ // That choice only applies while the message is still condensable.
+ if (long_message && message.condensed === true) {
condense_row($(elem));
continue;
}
- if (message.condensed === false) {
+ if (long_message && message.condensed === false) {
uncondense_row($(elem));
continue;
}