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

condense: Rewrite condense.toggle_collapse to be readable and correct. 

The proposed fix in #11662 was effectively a workaround for some
already bad logic.  What we actually want to do is described in the
updated function comment (from the spec in #5914), and requires an
additionl case that was not present in the original implementation
(which effectively assumed a collapsed message was condensible).

Also add some documentation.

Fixes #11662.
This commit is contained in:
Tim Abbott 2019-07-13 15:41:01 -07:00
parent 73b19672c3
commit ca23740478
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
static/js/condense.js
View File

@ -1,3 +1,15 @@
/*
This library implements two related, similar concepts:
- condensing, i.e. cutting off messages taller than about a half
screen so that they aren't distractingly tall (and offering a button
to uncondense them).
- Collapsing, i.e. taking a message and reducing its height to a
single line, with a button to see the content.
*/
var Dict = require('./dict').Dict; var Dict = require('./dict').Dict;
var condense = (function () { var condense = (function () {
@ -99,24 +111,39 @@ exports.toggle_collapse = function (message) {
return; return;
} }
// This function implements a multi-way toggle, to try to do what
// the user wants for messages:
//
// * If the message is currently showing any [More] link, either
// because it was previously condensed or collapsed, fully display it.
// * If the message is fully visible, either because it's too short to
// condense or because it's already uncondensed, collapse it
var row = current_msg_list.get_row(message.id); var row = current_msg_list.get_row(message.id);
if (!row) { if (!row) {
return; return;
} }
var condensed = row.find(".could-be-condensed");
var content = row.find(".message_content");
var is_condensable = content.hasClass("could-be-condensed");
var is_condensed = content.hasClass("condensed");
if (message.collapsed) { if (message.collapsed) {
message.condensed = true; if (is_condensable) {
message.condensed = true;
content.addClass("condensed");
exports.show_message_expander(row);
row.find(".message_condenser").hide();
}
condense.uncollapse(row); condense.uncollapse(row);
condensed.addClass("condensed"); } else {
exports.show_message_expander(row); if (is_condensed) {
row.find(".message_condenser").hide(); message.condensed = false;
} else if (!message.collapsed && condensed.hasClass("condensed")) { content.removeClass("condensed");
message.condensed = false; exports.hide_message_expander(row);
condensed.removeClass("condensed"); row.find(".message_condenser").show();
exports.hide_message_expander(row); } else {
row.find(".message_condenser").show(); condense.collapse(row);
} else if (!message.collapsed && !condensed.hasClass("condensed")) { }
condense.collapse(row);
} }
}; };