mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 14:03:30 +00:00
reload: Remove redundant parameter.
`save_narrow` is always true right now and it makes sense to always save the current narrow when reloading the app.
This commit is contained in:
@@ -26,7 +26,7 @@ function call_reload_hooks() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function preserve_state(send_after_reload, save_pointer, save_narrow, save_compose) {
|
function preserve_state(send_after_reload, save_pointer, save_compose) {
|
||||||
if (!localstorage.supported()) {
|
if (!localstorage.supported()) {
|
||||||
// If local storage is not supported by the browser, we can't
|
// If local storage is not supported by the browser, we can't
|
||||||
// save the browser's position across reloads (since there's
|
// save the browser's position across reloads (since there's
|
||||||
@@ -75,28 +75,26 @@ function preserve_state(send_after_reload, save_pointer, save_narrow, save_compo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (save_narrow) {
|
if (message_lists.current === message_lists.home) {
|
||||||
if (message_lists.current === message_lists.home) {
|
const $row = message_lists.home.selected_row();
|
||||||
const $row = message_lists.home.selected_row();
|
if ($row.length > 0) {
|
||||||
if ($row.length > 0) {
|
url += "+offset=" + $row.get_offset_to_window().top;
|
||||||
url += "+offset=" + $row.get_offset_to_window().top;
|
|
||||||
}
|
|
||||||
} else if (message_lists.current !== undefined) {
|
|
||||||
url += "+offset=" + message_lists.home.pre_narrow_offset;
|
|
||||||
|
|
||||||
// narrow_state.filter() is not undefined, so this is the current
|
|
||||||
// narrowed message list.
|
|
||||||
const narrow_pointer = message_lists.current.selected_id();
|
|
||||||
if (narrow_pointer !== -1) {
|
|
||||||
url += "+narrow_pointer=" + narrow_pointer;
|
|
||||||
}
|
|
||||||
const $narrow_row = message_lists.current.selected_row();
|
|
||||||
if ($narrow_row.length > 0) {
|
|
||||||
url += "+narrow_offset=" + $narrow_row.get_offset_to_window().top;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
url += "+offset=" + message_lists.home.pre_narrow_offset;
|
|
||||||
}
|
}
|
||||||
|
} else if (message_lists.current !== undefined) {
|
||||||
|
url += "+offset=" + message_lists.home.pre_narrow_offset;
|
||||||
|
|
||||||
|
// narrow_state.filter() is not undefined, so this is the current
|
||||||
|
// narrowed message list.
|
||||||
|
const narrow_pointer = message_lists.current.selected_id();
|
||||||
|
if (narrow_pointer !== -1) {
|
||||||
|
url += "+narrow_pointer=" + narrow_pointer;
|
||||||
|
}
|
||||||
|
const $narrow_row = message_lists.current.selected_row();
|
||||||
|
if ($narrow_row.length > 0) {
|
||||||
|
url += "+narrow_offset=" + $narrow_row.get_offset_to_window().top;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
url += "+offset=" + message_lists.home.pre_narrow_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
url += hash_util.build_reload_url();
|
url += hash_util.build_reload_url();
|
||||||
@@ -148,19 +146,17 @@ function delete_stale_tokens(ls) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function do_reload_app(send_after_reload, save_pointer, save_narrow, save_compose, message_html) {
|
function do_reload_app(send_after_reload, save_pointer, save_compose, message_html) {
|
||||||
if (reload_state.is_in_progress()) {
|
if (reload_state.is_in_progress()) {
|
||||||
blueslip.log("do_reload_app: Doing nothing since reload_in_progress");
|
blueslip.log("do_reload_app: Doing nothing since reload_in_progress");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: we should completely disable the UI here
|
// TODO: we should completely disable the UI here
|
||||||
if (save_pointer || save_narrow || save_compose) {
|
try {
|
||||||
try {
|
preserve_state(send_after_reload, save_pointer, save_compose);
|
||||||
preserve_state(send_after_reload, save_pointer, save_narrow, save_compose);
|
} catch (error) {
|
||||||
} catch (error) {
|
blueslip.error("Failed to preserve state", undefined, error);
|
||||||
blueslip.error("Failed to preserve state", undefined, error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: We need a better API for showing messages.
|
// TODO: We need a better API for showing messages.
|
||||||
@@ -204,13 +200,12 @@ function do_reload_app(send_after_reload, save_pointer, save_narrow, save_compos
|
|||||||
export function initiate({
|
export function initiate({
|
||||||
immediate = false,
|
immediate = false,
|
||||||
save_pointer = true,
|
save_pointer = true,
|
||||||
save_narrow = true,
|
|
||||||
save_compose = true,
|
save_compose = true,
|
||||||
send_after_reload = false,
|
send_after_reload = false,
|
||||||
message_html = "Reloading ...",
|
message_html = "Reloading ...",
|
||||||
}) {
|
}) {
|
||||||
if (immediate) {
|
if (immediate) {
|
||||||
do_reload_app(send_after_reload, save_pointer, save_narrow, save_compose, message_html);
|
do_reload_app(send_after_reload, save_pointer, save_compose, message_html);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reload_state.is_pending() || reload_state.is_in_progress()) {
|
if (reload_state.is_pending() || reload_state.is_in_progress()) {
|
||||||
@@ -247,7 +242,7 @@ export function initiate({
|
|||||||
let compose_started_handler;
|
let compose_started_handler;
|
||||||
|
|
||||||
function reload_from_idle() {
|
function reload_from_idle() {
|
||||||
do_reload_app(false, save_pointer, save_narrow, save_compose, message_html);
|
do_reload_app(false, save_pointer, save_compose, message_html);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure we always do a reload eventually after
|
// Make sure we always do a reload eventually after
|
||||||
@@ -302,7 +297,6 @@ reload_state.set_csrf_failed_handler(() => {
|
|||||||
initiate({
|
initiate({
|
||||||
immediate: true,
|
immediate: true,
|
||||||
save_pointer: true,
|
save_pointer: true,
|
||||||
save_narrow: true,
|
|
||||||
save_compose: true,
|
save_compose: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -218,7 +218,6 @@ function get_events({dont_block = false} = {}) {
|
|||||||
reload.initiate({
|
reload.initiate({
|
||||||
immediate: true,
|
immediate: true,
|
||||||
save_pointer: false,
|
save_pointer: false,
|
||||||
save_narrow: true,
|
|
||||||
save_compose: true,
|
save_compose: true,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -175,7 +175,6 @@ export function dispatch_normal_event(event) {
|
|||||||
case "web_reload_client": {
|
case "web_reload_client": {
|
||||||
const reload_options = {
|
const reload_options = {
|
||||||
save_pointer: true,
|
save_pointer: true,
|
||||||
save_narrow: true,
|
|
||||||
save_compose: true,
|
save_compose: true,
|
||||||
message_html: "The application has been updated; reloading!",
|
message_html: "The application has been updated; reloading!",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ export function send_message(request, on_success, error) {
|
|||||||
reload.initiate({
|
reload.initiate({
|
||||||
immediate: true,
|
immediate: true,
|
||||||
save_pointer: true,
|
save_pointer: true,
|
||||||
save_narrow: true,
|
|
||||||
save_compose: true,
|
save_compose: true,
|
||||||
send_after_reload: true,
|
send_after_reload: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ run_test("transmit_message_ajax_reload_pending", () => {
|
|||||||
assert.deepEqual(opts, {
|
assert.deepEqual(opts, {
|
||||||
immediate: true,
|
immediate: true,
|
||||||
save_pointer: true,
|
save_pointer: true,
|
||||||
save_narrow: true,
|
|
||||||
save_compose: true,
|
save_compose: true,
|
||||||
send_after_reload: true,
|
send_after_reload: true,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user