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

subs: Make "All streams" link to appropriate hash. 

This makes the “All streams” toggle bring the user to the hash
“streams/all” which saves their state.

Fixes: #5984.
This commit is contained in:
Brock Whittaker 2017-08-01 11:14:38 -07:00 committed by Tim Abbott
parent ef1b880082
commit f2b71ba12a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
static/js/subs.js
View File

@ -324,12 +324,19 @@ exports.setup_page = function (callback) {
function initialize_components() { function initialize_components() {
var stream_filter_toggle = components.toggle({ var stream_filter_toggle = components.toggle({
name: "stream-filter-toggle", name: "stream-filter-toggle",
selected: 0,
values: [ values: [
{ label: i18n.t("Subscribed") }, { label: i18n.t("Subscribed"), key: "subscribed" },
{ label: i18n.t("All streams") }, { label: i18n.t("All streams"), key: "all-streams" },
], ],
callback: function () { callback: function (value, key) {
// if you aren't on a particular stream (`streams/:id/:name`)
// then redirect to `streams/all` when you click "all-streams".
if (key === "all-streams") {
window.location.hash = "streams/all";
} else if (key === "subscribed") {
window.location.hash = "streams/subscribed";
}
actually_filter_streams(); actually_filter_streams();
remove_temporarily_miscategorized_streams(); remove_temporarily_miscategorized_streams();
}, },
@ -425,11 +432,12 @@ exports.change_state = (function () {
// if in #streams/new form. // if in #streams/new form.
if (hash.arguments[0] === "new") { if (hash.arguments[0] === "new") {
exports.new_stream_clicked(); exports.new_stream_clicked();
components.toggle.lookup("stream-filter-toggle").goto("All streams"); components.toggle.lookup("stream-filter-toggle").goto("all-streams");
} else if (hash.arguments[0] === "all") { } else if (hash.arguments[0] === "all") {
components.toggle.lookup("stream-filter-toggle").goto("All streams"); components.toggle.lookup("stream-filter-toggle").goto("all-streams");
} else if (hash.arguments[0] === "subscribed") { } else if (hash.arguments[0] === "subscribed") {
components.toggle.lookup("stream-filter-toggle").goto("Subscribed"); components.toggle.lookup("stream-filter-toggle").goto("subscribed"
);
// if the first argument is a valid number. // if the first argument is a valid number.
} else if (/\d+/.test(hash.arguments[0])) { } else if (/\d+/.test(hash.arguments[0])) {
var $stream_row = $(".stream-row[data-stream-id='" + hash.arguments[0] + "']"); var $stream_row = $(".stream-row[data-stream-id='" + hash.arguments[0] + "']");