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

Rename ignore.prev to ignore.hash_before_overlay.

This commit is contained in:
Steve Howell 2018-11-30 23:49:01 +00:00 committed by Tim Abbott
parent 53e99c0a55
commit 20bbc375a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/hashchange.js
View File

@ -172,7 +172,7 @@ function do_hashchange(from_reload) {
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -- // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -- //
var ignore = { var ignore = {
flag: false, flag: false,
prev: null, hash_before_overlay: null,
old_hash: typeof window !== "undefined" ? window.location.hash : "#", old_hash: typeof window !== "undefined" ? window.location.hash : "#",
group: null, group: null,
}; };
@ -242,7 +242,7 @@ function hashchanged(from_reload, e) {
// now only if the previous one should not have been ignored. // now only if the previous one should not have been ignored.
if (!is_overlay_hash(old_hash || "#")) { if (!is_overlay_hash(old_hash || "#")) {
ignore.prev = old_hash; ignore.hash_before_overlay = old_hash;
} }
if (base === "streams") { if (base === "streams") {
@ -288,7 +288,7 @@ exports.exit_overlay = function (callback) {
if (is_overlay_hash(window.location.hash)) { if (is_overlay_hash(window.location.hash)) {
ui_util.blur_active_element(); ui_util.blur_active_element();
ignore.flag = true; ignore.flag = true;
window.location.hash = ignore.prev || "#"; window.location.hash = ignore.hash_before_overlay || "#";
if (typeof callback === "function") { if (typeof callback === "function") {
callback(); callback();
} }