From 6c254ed6dca48ebbd83209493df0ffc1d2584f38 Mon Sep 17 00:00:00 2001 From: Ardis Lu Date: Mon, 2 Jan 2023 17:26:16 -0800 Subject: [PATCH 1/3] rustdoc: allow popover child links to work No need to prevent default click behavior on a
, it will also disable all child click behavior. --- src/librustdoc/html/static/js/main.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 60e4e749224..92baa68b5be 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -1040,9 +1040,6 @@ function loadCss(cssUrl) { help_button.appendChild(container); container.onblur = helpBlurHandler; - container.onclick = event => { - event.preventDefault(); - }; help_button.onblur = helpBlurHandler; help_button.children[0].onblur = helpBlurHandler; } From 2399df288ef5af538a331a974b037b889be5cfd2 Mon Sep 17 00:00:00 2001 From: Ardis Lu Date: Tue, 3 Jan 2023 20:38:07 -0800 Subject: [PATCH 2/3] Add test case to click popover child link --- src/test/rustdoc-gui/help-page.goml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/rustdoc-gui/help-page.goml b/src/test/rustdoc-gui/help-page.goml index 80203901ed3..050cf325bb8 100644 --- a/src/test/rustdoc-gui/help-page.goml +++ b/src/test/rustdoc-gui/help-page.goml @@ -61,3 +61,11 @@ click: "#help-button > a" assert-css: ("#help", {"display": "none"}) compare-elements-property-false: (".sub", "#help", ["offsetWidth"]) compare-elements-position-false: (".sub", "#help", ("x")) + +// This test ensures that the "the rustdoc book" anchor link within the help popover works. +goto: "file://" + |DOC_PATH| + "/test_docs/index.html" +size: (1000, 1000) // Popover only appears when the screen width is >700px. +assert-false: "#help" +click: "#help-button > a" +click: ".popover a[href='https://doc.rust-lang.org/rustdoc/']" +assert-document-property: {"URL": "https://doc.rust-lang.org/rustdoc/"} From 9792c9affb55e44bd93957c166a971007c66b5a2 Mon Sep 17 00:00:00 2001 From: Ardis Lu Date: Tue, 3 Jan 2023 23:44:35 -0800 Subject: [PATCH 3/3] Add hardcoded wait time for external navigation to load --- src/test/rustdoc-gui/help-page.goml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/rustdoc-gui/help-page.goml b/src/test/rustdoc-gui/help-page.goml index 050cf325bb8..83f2556fd8f 100644 --- a/src/test/rustdoc-gui/help-page.goml +++ b/src/test/rustdoc-gui/help-page.goml @@ -68,4 +68,5 @@ size: (1000, 1000) // Popover only appears when the screen width is >700px. assert-false: "#help" click: "#help-button > a" click: ".popover a[href='https://doc.rust-lang.org/rustdoc/']" +wait-for: 2000 assert-document-property: {"URL": "https://doc.rust-lang.org/rustdoc/"}