mirror of
				https://github.com/zulip/zulip.git
				synced 2025-10-31 12:03:46 +00:00 
			
		
		
		
	info_overlay: Make them overlays from quasi-overlays.
We always use hashchange.go_to_location method now to open the info_overlay, this makes sure that the url hash are reliable and hotkeys don't get confused if an overlay is open or not. We don't want to change hash to "" (this also doesn't navigates us to 'All messages' view, hence the bug was not noticed.) on exit of info_overlay.
This commit is contained in:
		| @@ -208,31 +208,19 @@ run_test("hash_interactions", () => { | ||||
|  | ||||
|     helper.clear_events(); | ||||
|     $(window).trigger($.Event("hashchange", {})); | ||||
|     helper.assert_events([ | ||||
|         "overlays.close_for_hash_change", | ||||
|         "message_viewport.stop_auto_scrolling", | ||||
|         "info: keyboard-shortcuts", | ||||
|     ]); | ||||
|     helper.assert_events(["overlays.close_for_hash_change", "info: keyboard-shortcuts"]); | ||||
|  | ||||
|     window.location.hash = "#message-formatting/whatever"; | ||||
|  | ||||
|     helper.clear_events(); | ||||
|     $(window).trigger($.Event("hashchange", {})); | ||||
|     helper.assert_events([ | ||||
|         "overlays.close_for_hash_change", | ||||
|         "message_viewport.stop_auto_scrolling", | ||||
|         "info: message-formatting", | ||||
|     ]); | ||||
|     helper.assert_events(["overlays.close_for_hash_change", "info: message-formatting"]); | ||||
|  | ||||
|     window.location.hash = "#search-operators/whatever"; | ||||
|  | ||||
|     helper.clear_events(); | ||||
|     $(window).trigger($.Event("hashchange", {})); | ||||
|     helper.assert_events([ | ||||
|         "overlays.close_for_hash_change", | ||||
|         "message_viewport.stop_auto_scrolling", | ||||
|         "info: search-operators", | ||||
|     ]); | ||||
|     helper.assert_events(["overlays.close_for_hash_change", "info: search-operators"]); | ||||
|  | ||||
|     window.location.hash = "#drafts"; | ||||
|  | ||||
|   | ||||
| @@ -262,7 +262,7 @@ run_test("basic_chars", () => { | ||||
|     test_normal_typing(); | ||||
|     overlays.is_active = return_false; | ||||
|  | ||||
|     assert_mapping("?", "info_overlay.maybe_show_keyboard_shortcuts"); | ||||
|     assert_mapping("?", "hashchange.go_to_location"); | ||||
|     assert_mapping("/", "search.initiate_search"); | ||||
|     assert_mapping("w", "activity.initiate_search"); | ||||
|     assert_mapping("q", "stream_list.initiate_search"); | ||||
|   | ||||
| @@ -673,7 +673,7 @@ exports.initialize = function () { | ||||
|  | ||||
|     $("body").on("click", "[data-overlay-trigger]", function () { | ||||
|         const target = $(this).attr("data-overlay-trigger"); | ||||
|         info_overlay.show(target); | ||||
|         hashchange.go_to_location(target); | ||||
|     }); | ||||
|  | ||||
|     function handle_compose_click(e) { | ||||
|   | ||||
| @@ -64,7 +64,7 @@ The "info:" items use our info overlay system | ||||
| in static/js/info_overlay.js.  They are dispatched | ||||
| using a click handler in static/js/click_handlers.js. | ||||
| The click handler uses "[data-overlay-trigger]" as | ||||
| the selector and then calls info_overlay.show. | ||||
| the selector and then calls hash_change.go_to_location. | ||||
|  | ||||
| */ | ||||
|  | ||||
|   | ||||
| @@ -69,6 +69,9 @@ function is_overlay_hash(hash) { | ||||
|         "organization", | ||||
|         "invite", | ||||
|         "recent_topics", | ||||
|         "keyboard-shortcuts", | ||||
|         "message-formatting", | ||||
|         "search-operators", | ||||
|     ]; | ||||
|     const main_hash = hash_util.get_hash_category(hash); | ||||
|  | ||||
| @@ -115,14 +118,8 @@ function do_hashchange_normal(from_reload) { | ||||
|             activate_home_tab(); | ||||
|             break; | ||||
|         case "#keyboard-shortcuts": | ||||
|             info_overlay.show("keyboard-shortcuts"); | ||||
|             break; | ||||
|         case "#message-formatting": | ||||
|             info_overlay.show("message-formatting"); | ||||
|             break; | ||||
|         case "#search-operators": | ||||
|             info_overlay.show("search-operators"); | ||||
|             break; | ||||
|         case "#drafts": | ||||
|         case "#invite": | ||||
|         case "#streams": | ||||
| @@ -223,6 +220,20 @@ function do_hashchange_overlay(old_hash) { | ||||
|         recent_topics.launch(); | ||||
|         return; | ||||
|     } | ||||
|     if (base === "keyboard-shortcuts") { | ||||
|         info_overlay.show("keyboard-shortcuts"); | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     if (base === "message-formatting") { | ||||
|         info_overlay.show("message-formatting"); | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     if (base === "search-operators") { | ||||
|         info_overlay.show("search-operators"); | ||||
|         return; | ||||
|     } | ||||
| } | ||||
|  | ||||
| function hashchanged(from_reload, e) { | ||||
|   | ||||
| @@ -653,7 +653,7 @@ exports.process_hotkey = function (e, hotkey) { | ||||
|             gear_menu.open(); | ||||
|             return true; | ||||
|         case "show_shortcuts": // Show keyboard shortcuts page | ||||
|             info_overlay.maybe_show_keyboard_shortcuts(); | ||||
|             hashchange.go_to_location("keyboard-shortcuts"); | ||||
|             return true; | ||||
|         case "stream_cycle_backward": | ||||
|             narrow.stream_cycle_backward(); | ||||
|   | ||||
| @@ -57,7 +57,7 @@ exports.show = function (target) { | ||||
|             name: "informationalOverlays", | ||||
|             overlay, | ||||
|             on_close() { | ||||
|                 hashchange.changehash(""); | ||||
|                 hashchange.exit_overlay(); | ||||
|             }, | ||||
|         }); | ||||
|     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user