CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "Automatically condense long messages"

Browse Source 
This reverts commit 057f08f2fcef43070b0838a600f6a89c479b4ee8.

(imported from commit ba1dbfcaeef6bc1d5befb2d59122217f532065ac)
This commit is contained in:
Jeff Arnold 2013-04-18 21:45:59 -04:00
parent 484095d815
commit 7b87c201f0
4 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zephyr/static/js/message_list.js
View File

@ -396,18 +396,6 @@ MessageList.prototype = {
}});
}
$.each(rendered_elems, function (index, elem) {
var row = $(elem);
var content = $(elem).find(".message_content")[0];
if (content !== undefined) {
if( content.offsetHeight < content.scrollHeight ||
content.offsetWidth < content.scrollWidth) {
$(elem).find(".message_expander").show();
}
}
});
// Re-add the fading of messages that is lost when we re-render.
compose.update_faded_messages();

17
zephyr/static/js/ui.js
View File

@ -877,8 +877,7 @@ $(function () {
$("#main_div").on("click", ".messagebox", function (e) {
var target = $(e.target);
if (target.is("a") || target.is("img.message_inline_image") || target.is("img.twitter-avatar") ||
target.is("div.message_length_controller")) {
if (target.is("a") || target.is("img.message_inline_image") || target.is("img.twitter-avatar")) {
// If this click came from a hyperlink, don't trigger the
// reply action. The simple way of doing this is simply
// to call e.stopPropagation() from within the link's
@ -934,20 +933,6 @@ $(function () {
toggle_star(rows.id($(this).closest(".message_row")));
});
$("#home").on("click", ".message_expander", function (e) {
var row = $(this).closest(".message_row");
row.find(".message_content").addClass("expanded");
$(this).hide();
row.find(".message_collapser").show();
});
$("#home").on("click", ".message_collapser", function (e) {
var row = $(this).closest(".message_row");
row.find(".message_content").removeClass("expanded");
$(this).hide();
row.find(".message_expander").show();
});
$("#home").on("click", ".narrows_by_recipient", function (e) {
var nearest = current_msg_list.get(rows.id($(this).closest(".recipient_row")));
var selected = current_msg_list.selected_message();

19
zephyr/static/styles/zephyr.css
View File

@ -432,9 +432,6 @@ table.focused_table {
.message_content {
margin-left: 5px;
margin-right: 35px; /* size of the timestamp */
line-height: 1.5em;
max-height: 9.0em;
overflow: hidden;
}
@media (max-width: 480px) {
.message_content {
@ -442,20 +439,6 @@ table.focused_table {
}
}
.message_content.expanded {
max-height: none;
}
.message_length_controller {
display: none;
text-align: center;
color: #0088CC;
}
.message_length_controller:hover {
text-decoration: underline;
}
blockquote {
margin-bottom: 6px;
}
@ -1130,4 +1113,4 @@ li.expanded_subject {
.sub-unsub-message {
text-align: center;
padding-bottom: 10px; /* same as .bookend */
}
}

2
zephyr/static/templates/message.handlebars
View File

@ -85,8 +85,6 @@
</div>
</div>
<div class="message_content">{{{content}}}</div>
<div class="message_expander message_length_controller" title="See the rest of this message">[More...]</div>
<div class="message_collapser message_length_controller" title="Make this message take up less space on the screen">[Collapse this message]</div>
</td>
</tr>
{{/with}}