diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-07-15 15:53:39 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-15 15:53:39 +0530 |
| commit | 5c8c4dbce9eb210539bbd98e09b665b4c285bdc4 (patch) | |
| tree | 4ae3e863b380349f52bcff050fdd259fc794b08f | |
| parent | 24f0e1499e6d6108e8bc3e06056713d4b3ea3656 (diff) | |
| parent | b98fb490b8d2c036cc733652e838789079c03db2 (diff) | |
| download | rust-5c8c4dbce9eb210539bbd98e09b665b4c285bdc4.tar.gz rust-5c8c4dbce9eb210539bbd98e09b665b4c285bdc4.zip | |
Rollup merge of #99209 - GuillaumeGomez:crate-level-sidebar, r=jsha
Correctly handle crate level page on docs.rs as well Fixes #99121. On docs.rs, they move the `class` attribute into a child which still has `rustdoc`. So instead of using the `<body>`, we can simply use this one directly. r? `@jsha`
| -rw-r--r-- | src/librustdoc/html/static/js/main.js | 31 | ||||
| -rw-r--r-- | src/librustdoc/html/templates/page.html | 2 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 6658f07ce01..2aef978a072 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -479,23 +479,20 @@ function loadCss(cssFileName) { } if (sidebar) { - const isModule = hasClass(document.body, "mod"); - if (!isModule) { - block("primitive", "primitives", "Primitive Types"); - block("mod", "modules", "Modules"); - block("macro", "macros", "Macros"); - block("struct", "structs", "Structs"); - block("enum", "enums", "Enums"); - block("union", "unions", "Unions"); - block("constant", "constants", "Constants"); - block("static", "static", "Statics"); - block("trait", "traits", "Traits"); - block("fn", "functions", "Functions"); - block("type", "types", "Type Definitions"); - block("foreigntype", "foreign-types", "Foreign Types"); - block("keyword", "keywords", "Keywords"); - block("traitalias", "trait-aliases", "Trait Aliases"); - } + block("primitive", "primitives", "Primitive Types"); + block("mod", "modules", "Modules"); + block("macro", "macros", "Macros"); + block("struct", "structs", "Structs"); + block("enum", "enums", "Enums"); + block("union", "unions", "Unions"); + block("constant", "constants", "Constants"); + block("static", "static", "Statics"); + block("trait", "traits", "Traits"); + block("fn", "functions", "Functions"); + block("type", "types", "Type Definitions"); + block("foreigntype", "foreign-types", "Foreign Types"); + block("keyword", "keywords", "Keywords"); + block("traitalias", "trait-aliases", "Trait Aliases"); } } diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index dfb3e4e6a2c..9a551b68279 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -39,7 +39,7 @@ {%- else if page.css_class == "source" -%} <script defer src="{{static_root_path|safe}}source-script{{page.resource_suffix}}.js"></script> {#- -#} <script defer src="{{page.root_path|safe}}source-files{{page.resource_suffix}}.js"></script> {#- -#} - {%- else -%} + {%- else if !page.css_class.contains("mod") -%} <script defer src="sidebar-items{{page.resource_suffix}}.js"></script> {#- -#} {%- endif -%} <script defer src="{{static_root_path|safe}}main{{page.resource_suffix}}.js"></script> {#- -#} |