mirror of https://github.com/zulip/zulip.git
Snap back to where you were in the home view upon un-narrowing.
(imported from commit 72458f4006890c392e5ca557f7178260bff7c7f9)
This commit is contained in:
parent
8e1ce1c371
commit
3d2de1fa7c
|
@ -183,6 +183,9 @@ $(function () {
|
||||||
|
|
||||||
var selected_zephyr_id = 0; /* to be filled in on document.ready */
|
var selected_zephyr_id = 0; /* to be filled in on document.ready */
|
||||||
var last_received = -1;
|
var last_received = -1;
|
||||||
|
var narrowed = false;
|
||||||
|
// For tracking where you were before you narrowed.
|
||||||
|
var persistent_zephyr_id = 0;
|
||||||
|
|
||||||
function get_all_zephyr_rows() {
|
function get_all_zephyr_rows() {
|
||||||
return $('tr.zephyr_row');
|
return $('tr.zephyr_row');
|
||||||
|
@ -255,7 +258,11 @@ function update_pointer(zephyr) {
|
||||||
$('.selected_zephyr').removeClass('selected_zephyr');
|
$('.selected_zephyr').removeClass('selected_zephyr');
|
||||||
zephyr.addClass('selected_zephyr');
|
zephyr.addClass('selected_zephyr');
|
||||||
|
|
||||||
$.post("update", { pointer: selected_zephyr_id });
|
if (!narrowed) {
|
||||||
|
// Narrowing is a temporary view on top of the home view and
|
||||||
|
// doesn't permanently affect where you are.
|
||||||
|
$.post("update", { pointer: selected_zephyr_id });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function update_pointer_by_id(zephyr_id) {
|
function update_pointer_by_id(zephyr_id) {
|
||||||
|
@ -434,6 +441,10 @@ function prepare_huddle(recipients) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function do_narrow(description, filter_function) {
|
function do_narrow(description, filter_function) {
|
||||||
|
// Your pointer isn't changed when narrowed.
|
||||||
|
narrowed = true;
|
||||||
|
persistent_zephyr_id = selected_zephyr_id;
|
||||||
|
|
||||||
// Hide the messages temporarily, so the browser doesn't waste time
|
// Hide the messages temporarily, so the browser doesn't waste time
|
||||||
// incrementally recalculating the layout.
|
// incrementally recalculating the layout.
|
||||||
$("#main_div").hide();
|
$("#main_div").hide();
|
||||||
|
@ -519,10 +530,13 @@ function narrow_instance() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_all_messages() {
|
function show_all_messages() {
|
||||||
|
narrowed = false;
|
||||||
|
|
||||||
current_view_predicate = home_view;
|
current_view_predicate = home_view;
|
||||||
get_all_zephyr_rows().show();
|
get_all_zephyr_rows().show();
|
||||||
|
|
||||||
scroll_to_selected();
|
// Includes scrolling.
|
||||||
|
select_zephyr(persistent_zephyr_id);
|
||||||
|
|
||||||
$("#narrowbox").hide();
|
$("#narrowbox").hide();
|
||||||
$("#show_all_messages").attr("disabled", "disabled");
|
$("#show_all_messages").attr("disabled", "disabled");
|
||||||
|
|
Loading…
Reference in New Issue