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

parse_narrow: Handle malformed narrow URLs gracefully. 

Since they can't be parsed, probably the best thing to do is to send
the user to the home tab; we could add in showing an error message but
then we'd need a way to clear the error message -- better to just have
this work.

(imported from commit 67c0475ff06eb0431621eef60b9c50287a158232)
This commit is contained in:
Tim Abbott 2013-05-02 11:38:29 -04:00
parent 2c9c5f6093
commit 525a20de2e
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
zephyr/static/js/hashchange.js
View File

@ -57,14 +57,21 @@ function parse_narrow(hash) {
for (i=1; i<hash.length; i+=2) {
// We don't construct URLs with an odd number of components,
// but the user might write one.
var operator = decodeHashComponent(hash[i]);
var operand = decodeHashComponent(hash[i+1] || '');
operators.push([operator, operand]);
try {
var operator = decodeHashComponent(hash[i]);
var operand = decodeHashComponent(hash[i+1] || '');
operators.push([operator, operand]);
} catch (err) {
return undefined;
}
}
narrow.activate(operators, {
select_first_unread: true,
change_hash: false // already set
});
return operators;
}
function activate_home_tab() {
ui.change_tab_to("#home");
narrow.deactivate();
ui.update_floating_recipient_bar();
}
// Returns true if this function performed a narrow
@ -92,14 +99,23 @@ function do_hashchange() {
switch (hash[0]) {
case "#narrow":
ui.change_tab_to("#home");
parse_narrow(hash);
var operators = parse_narrow(hash);
if (operators === undefined) {
// If the narrow URL didn't parse, clear
// window.location.hash and send them to the home tab
window.location.hash = '';
activate_home_tab();
return false;
}
narrow.activate(operators, {
select_first_unread: true,
change_hash: false // already set
});
ui.update_floating_recipient_bar();
return true;
case "":
case "#":
ui.change_tab_to("#home");
narrow.deactivate();
ui.update_floating_recipient_bar();
activate_home_tab();
break;
case "#subscriptions":
ui.change_tab_to("#subscriptions");