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

Get rid of current_view_predicate

Browse Source 
Use 'narrowed' for the same role.  (Functions are always true-ish in
Javascript.)

Also, don't add messages to the narrowed table if not narrowed (my bad).

(imported from commit 31707d39abb97472a36d3816c62482e39e732fdc)
This commit is contained in:
Keegan McAllister 2012-09-24 18:42:04 -04:00
parent 877954aa55
commit 613e042b7c
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zephyr/static/js/zephyr.js
View File

@ -294,7 +294,10 @@ $(function () {
var selected_zephyr_id = 0; /* to be filled in on document.ready */
var selected_zephyr; // = get_zephyr_row(selected_zephyr_id)
var last_received = -1;
// Narrowing predicate, or 'false' for the home view.
var narrowed = false;
// For tracking where you were before you narrowed.
var persistent_zephyr_id = 0;
@ -453,27 +456,18 @@ $(function () {
});
});
function home_view(element) {
return true;
}
var current_view_predicate = home_view;
function prepare_huddle(recipients) {
// Used for both personals and huddles.
show_compose('personal', $("#new_personal_zephyr"));
$("#recipient").val(recipients);
}
function do_narrow(description, filter_function) {
narrowed = filter_function;
// Your pointer isn't changed when narrowed.
narrowed = true;
persistent_zephyr_id = selected_zephyr_id;
current_view_predicate = filter_function;
// We want the zephyr on which the narrow happened to stay in the same place if possible.
var old_top = $("#main_div").offset().top - selected_zephyr.offset().top;
var parent;
@ -565,8 +559,6 @@ function show_all_messages() {
}
narrowed = false;
current_view_predicate = home_view;
$("#zfilt").removeClass('focused_table');
$("#zhome").addClass('focused_table');
$("#narrowbox").hide();
@ -709,8 +701,12 @@ function add_zephyr_metadata(dummy, zephyr) {
function add_messages(zephyrs) {
$.each(zephyrs, add_zephyr_metadata);
add_to_table(zephyrs, 'zhome', home_view);
add_to_table(zephyrs, 'zfilt', current_view_predicate);
if (narrowed)
add_to_table(zephyrs, 'zfilt', narrowed);
// Even when narrowed, add messages to the home view so they exist when we un-narrow.
add_to_table(zephyrs, 'zhome', function () { return true; });
}
$(function () {