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

settings: Remove intermediate hash change. 

This removes an unecessary intermediate hash change when opening
up the settings page automatically on page load.

Fixes: #3634.
This commit is contained in:
Brock Whittaker 2017-08-01 11:37:14 -07:00 committed by Tim Abbott
parent a2edbcbe94
commit 7c63b061c1
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/admin.js
View File

@ -87,7 +87,7 @@ exports.launch_page = function (tab) {
var $active_tab = $("#settings_overlay_container li[data-section='" + tab + "']");
if ($active_tab.hasClass("admin")) {
$(".sidebar .ind-tab[data-tab-key='organization']").click();
components.toggle.lookup("settings-toggle").goto("organization", { dont_switch_tab: true });
}
overlays.open_settings();

10
static/js/click_handlers.js
View File

@ -728,15 +728,19 @@ $(function () {
{ label: i18n.t("Settings"), key: "settings" },
{ label: i18n.t("Organization"), key: "organization" },
],
callback: function (name, key) {
callback: function (name, key, payload) {
$(".sidebar li").hide();
if (key === "organization") {
$("li.admin").show();
$("li[data-section='organization-settings']").click();
if (!payload.dont_switch_tab) {
$("li[data-section='organization-settings']").click();
}
} else {
$("li:not(.admin)").show();
$("li[data-section='your-account']").click();
if (!payload.dont_switch_tab) {
$("li[data-section='your-account']").click();
}
}
},
}).get();

11
static/js/components.js
View File

@ -55,7 +55,7 @@ exports.toggle = (function () {
if (meta.last_value !== opts.values[id].label) {
meta.last_value = opts.values[id].label;
opts.callback(meta.last_value, opts.values[id].key);
opts.callback(meta.last_value, opts.values[id].key, {});
}
}
});
@ -79,7 +79,12 @@ exports.toggle = (function () {
},
// go through the process of finding the correct tab for a given name,
// and when found, select that one and provide the proper callback.
goto: function (name) {
// supply a payload of data; since this is a custom event, we'll pass
// the data through to the callback.
goto: function (name, payload) {
// there are cases in which you would want to set this tab, but
// not to run the content inside the callback because it doesn't
// need to be initialized.
var value = _.find(opts.values, function (o) {
return o.label === name || o.key === name;
});
@ -90,7 +95,7 @@ exports.toggle = (function () {
meta.$ind_tab.removeClass("selected");
meta.$ind_tab.filter("[data-tab-id='" + idx + "']").addClass("selected");
opts.callback(value.label, value.key);
opts.callback(value.label, value.key, payload || {});
meta.last_value = idx;
}

2
static/js/settings.js
View File

@ -112,7 +112,7 @@ exports.launch_page = function (tab) {
var $active_tab = $("#settings_overlay_container li[data-section='" + tab + "']");
if (!$active_tab.hasClass("admin")) {
$(".sidebar .ind-tab[data-tab-key='settings']").click();
components.toggle.lookup("settings-toggle").goto("settings", { dont_switch_tab: true });
}
overlays.open_settings();