paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 11:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

hashchange: Rename ignore to state.

Browse Source
This commit is contained in:
Steve Howell
2018-12-01 00:55:36 +00:00
committed by Tim Abbott
parent 4b6ae10fb7
commit b80de69932
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
static/js/hashchange.js
View File

@@ -170,7 +170,7 @@ function do_hashchange(from_reload) {
// (eg. narrow/is/private). This saves the state, scroll position, and makes the // (eg. narrow/is/private). This saves the state, scroll position, and makes the
// hash change functionally inert. // hash change functionally inert.
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -- // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -- //
var ignore = { var state = {
is_exiting_overlay: false, is_exiting_overlay: false,
hash_before_overlay: null, hash_before_overlay: null,
old_hash: typeof window !== "undefined" ? window.location.hash : "#", old_hash: typeof window !== "undefined" ? window.location.hash : "#",
@@ -228,14 +228,14 @@ function hashchanged_overlay(old_hash) {
// if the old has was a standard non-ignore hash OR the ignore hash // if the old has was a standard non-ignore hash OR the ignore hash
// base has changed, something needs to run again. // base has changed, something needs to run again.
if (!is_overlay_hash(old_hash || "#") || ignore.old_overlay_group !== get_hash_group(base)) { if (!is_overlay_hash(old_hash || "#") || state.old_overlay_group !== get_hash_group(base)) {
if (ignore.old_overlay_group !== get_hash_group(base)) { if (state.old_overlay_group !== get_hash_group(base)) {
overlays.close_for_hash_change(); overlays.close_for_hash_change();
} }
// 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.hash_before_overlay = old_hash; state.hash_before_overlay = old_hash;
} }
if (base === "streams") { if (base === "streams") {
@@ -249,7 +249,7 @@ function hashchanged_overlay(old_hash) {
invite.launch(); invite.launch();
} }
ignore.old_overlay_group = get_hash_group(base); state.old_overlay_group = get_hash_group(base);
} else { } else {
subs.change_state(get_hash_components()); subs.change_state(get_hash_components());
} }
@@ -258,8 +258,8 @@ function hashchanged_overlay(old_hash) {
function hashchanged(from_reload, e) { function hashchanged(from_reload, e) {
var old_hash; var old_hash;
if (e) { if (e) {
old_hash = "#" + (e.oldURL || ignore.old_hash).split(/#/).slice(1).join(""); old_hash = "#" + (e.oldURL || state.old_hash).split(/#/).slice(1).join("");
ignore.old_hash = window.location.hash; state.old_hash = window.location.hash;
} }
if (is_overlay_hash(window.location.hash)) { if (is_overlay_hash(window.location.hash)) {
@@ -269,11 +269,11 @@ function hashchanged(from_reload, e) {
// We know we are going to a "main screen" view at this point, but // We know we are going to a "main screen" view at this point, but
// it may have been due to us closing an overlay. // it may have been due to us closing an overlay.
if (ignore.is_exiting_overlay) { if (state.is_exiting_overlay) {
// Some click handler or something caused us to exit the overlay, // Some click handler or something caused us to exit the overlay,
// and we updated the browser location. When we get this function // and we updated the browser location. When we get this function
// triggered, we already did the work of closing the overlay. // triggered, we already did the work of closing the overlay.
ignore.is_exiting_overlay = false; state.is_exiting_overlay = false;
return; return;
} }
@@ -297,8 +297,8 @@ exports.initialize = function () {
exports.exit_overlay = function (callback) { 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.is_exiting_overlay = true; state.is_exiting_overlay = true;
window.location.hash = ignore.hash_before_overlay || "#"; window.location.hash = state.hash_before_overlay || "#";
if (typeof callback === "function") { if (typeof callback === "function") {
callback(); callback();
} }