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

Revert "Collapse duplicate instance names, add breaks." 

This reverts commit 8c47682cd80fec0d221a519abc593f4d83dc90b5.

I accidentally broke.. a lot of things in my last commit. Lets fix those
issues before pushing to master again.

(imported from commit fbadd6e854722e41cccd2535748ee47f4efd657b)
This commit is contained in:
Luke Faraone 2012-09-11 15:19:51 -04:00
parent a5d105dbae
commit 34a7ad5be0
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zephyr/jstemplates/zephyr.html
View File

@ -1,7 +1,6 @@
{{! Client-side Mustache template for rendering zephyrs.}}
<td class="pointer"><p></p></td>
<td class="zephyr_recipient"><p onclick="select_zephyr({{id}})">
{{#include_recipient}}
{{#is_huddle}}
<span class="hidden zephyr_huddle_recipients_list
">{{#display_recipient}}{{name}},{{/display_recipient}}</span>
@ -23,7 +22,6 @@
<span class="zephyr_label_clickable zephyr_instance"
onclick="select_zephyr({{id}}); narrow_instance();">{{instance}}</span>
{{/is_class}}
{{/include_recipient}}
<br />
</td>
<td class="messagebox" onclick="select_zephyr({{id}})">

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

@ -465,23 +465,6 @@ function add_message(index, zephyr) {
}
zephyr.html_content = newline2br(zephyr.content);
parent = $('#table tr:last-child');
zephyr_class = parent.find("span.zephyr_class").text();
zephyr_huddle = parent.find("span.zephyr_huddle_recipient").text();
zephyr_personal = parent.find("span.zephyr_personal_recipient").text();
zephyr_instance = parent.find("span.zephyr_instance").text();
if ((zephyr.is_huddle && zephyr_huddle === zephyr.name) ||
(zephyr.is_personal && zephyr_personal === zephyr.display_recipient) ||
(zephyr.is_class && zephyr_class === zephyr.display_recipient &&
zephyr_instance === zephyr.instance)) {
zephyr.include_recipient = false;
} else {
zephyr.include_recipient = true;
// add a space to the table
$('#table').append($('<tr />').append($('<td />').html('<br/>')));
}
var new_tr = $('<tr />').attr('id', zephyr.id);
$('#table').append(new_tr);
new_tr.append(ich.zephyr(zephyr));