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

Clean up narrowing code to all use the same pattern. 

(imported from commit 7f213ccdb31522a0fcb63cb69e2ea7677e3b352c)
This commit is contained in:
Tim Abbott 2012-08-31 15:48:40 -04:00
parent e4e3fde8a5
commit 6369da671b
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
zephyr/static/js/zephyr.js
View File

@ -194,32 +194,23 @@ function scroll_to_selected() {
} }
function hide_personals() {
$("span.zephyr_personal_recipient").each(
function() {
$(this).parents("tr").hide();
}
);
}
function narrow_personals(target_zephyr) { function narrow_personals(target_zephyr) {
var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top; var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top;
$("tr").each(
$("span.zephyr_personal_recipient").each(
function() { function() {
$(this).parents("tr").show(); if ($(this).find("span.zephyr_personal_recipient").length) {
$(this).show();
} else {
$(this).hide();
} }
);
event.preventDefault();
$("span.zephyr_class").each(
function() {
$(this).parents("tr").hide();
} }
); );
$("#selected").closest("td").empty(); $("#selected").closest("td").empty();
$("#" + target_zephyr).children("td:first").html(selected_tag); $("#" + target_zephyr).children("td:first").html(selected_tag);
$.post("update", {pointer: target_zephyr}); $.post("update", {pointer: target_zephyr});
// Try to keep the zephyr in the same place on the screen after narrowing.
scroll_to_zephyr(target_zephyr, old_top); scroll_to_zephyr(target_zephyr, old_top);
$("#unhide").removeAttr("disabled"); $("#unhide").removeAttr("disabled");
@ -229,17 +220,17 @@ function narrow_personals(target_zephyr) {
function narrow_class(class_name, target_zephyr) { function narrow_class(class_name, target_zephyr) {
// We want the zephyr on which the narrow happened to stay in the same place if possible. // We want the zephyr on which the narrow happened to stay in the same place if possible.
var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top; var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top;
$("span.zephyr_class").each( $("tr").each(
function() { function() {
if ($(this).text() != class_name) { if ($(this).find("span.zephyr_class").length &&
$(this).parents("tr").hide(); $(this).find("span.zephyr_class").text() == class_name) {
$(this).show();
} else { } else {
// If you've narrowed on an instance and then click on the class, that should unhide the other instances on that class. $(this).hide();
$(this).parents("tr").show();
} }
} }
); );
hide_personals();
$("#selected").closest("td").empty(); $("#selected").closest("td").empty();
$("#" + target_zephyr).children("td:first").html(selected_tag); $("#" + target_zephyr).children("td:first").html(selected_tag);
$.post("update", {pointer: target_zephyr}); $.post("update", {pointer: target_zephyr});
@ -254,13 +245,16 @@ function narrow_instance(class_name, instance, target_zephyr) {
var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top; var old_top = $("#main_div").offset().top - $("#" + target_zephyr).offset().top;
$("tr").each( $("tr").each(
function() { function() {
if (($(this).find("span.zephyr_class").text() != class_name) || if ($(this).find("span.zephyr_class").length &&
($(this).find("span.zephyr_instance").text() != instance)) { $(this).find("span.zephyr_class").text() == class_name &&
$(this).find("span.zephyr_instance").text() == instance) {
$(this).show();
} else {
$(this).hide(); $(this).hide();
} }
} }
); );
hide_personals();
$("#selected").closest("td").empty(); $("#selected").closest("td").empty();
$("#" + target_zephyr).children("td:first").html(selected_tag); $("#" + target_zephyr).children("td:first").html(selected_tag);
$.post("update", {pointer: target_zephyr}); $.post("update", {pointer: target_zephyr});