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

Unbreak scroll-position-restoring for the settings page. 

(imported from commit 81dcf4d81189764710506294ee4f9400ecd5d883)
This commit is contained in:
Waseem Daher 2013-01-21 18:51:15 -05:00
parent 34bc6c8034
commit 1f103231e4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zephyr/static/js/ui.js
View File

@ -611,13 +611,7 @@ $(function () {
scroll_positions[old_tab] = viewport.scrollTop(); scroll_positions[old_tab] = viewport.scrollTop();
}); });
$('#gear-menu a[data-toggle="tab"]').on('shown', function (e) { $('#gear-menu a[data-toggle="tab"]').on('shown', function (e) {
// Right after we show the new tab, restore its old scroll position
var target_tab = $(e.target).attr('href'); var target_tab = $(e.target).attr('href');
if (scroll_positions.hasOwnProperty(target_tab)) {
viewport.scrollTop(scroll_positions[target_tab]);
} else {
viewport.scrollTop(0);
}
// Hide all our error messages when switching tabs // Hide all our error messages when switching tabs
$('.alert-error').hide(); $('.alert-error').hide();
@ -638,6 +632,15 @@ $(function () {
browser_url = ""; browser_url = "";
} }
hashchange.changehash(browser_url); hashchange.changehash(browser_url);
// After we show the new tab, restore its old scroll position
// (we apparently have to do this after setting the hash,
// because otherwise that action may scroll us somewhere.)
if (scroll_positions.hasOwnProperty(target_tab)) {
viewport.scrollTop(scroll_positions[target_tab]);
} else {
viewport.scrollTop(0);
}
}); });
// N.B. that subs.setup_page calls focus() on our stream textbox, // N.B. that subs.setup_page calls focus() on our stream textbox,