Skip to content

Commit cf46186

Browse files
authored
Fixed side effect of scope on outdated banner (#7959)
1 parent 26a32ea commit cf46186

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

material/overrides/assets/javascripts/iconsearch_index.json

+1
Large diffs are not rendered by default.

material/templates/assets/javascripts/bundle.5090c770.min.js material/templates/assets/javascripts/bundle.f13b1293.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/assets/javascripts/bundle.5090c770.min.js.map material/templates/assets/javascripts/bundle.f13b1293.min.js.map

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
</script>
250250
{% endblock %}
251251
{% block scripts %}
252-
<script src="{{ 'assets/javascripts/bundle.5090c770.min.js' | url }}"></script>
252+
<script src="{{ 'assets/javascripts/bundle.f13b1293.min.js' | url }}"></script>
253253
{% for script in config.extra_javascript %}
254254
{{ script | script_tag }}
255255
{% endfor %}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{#-
22
This file was automatically generated - do not edit
33
-#}
4-
<script>var el=document.querySelector("[data-md-component=outdated]"),outdated=__md_get("__outdated",sessionStorage);!0===outdated&&el&&(el.hidden=!1)</script>
4+
<script>var el=document.querySelector("[data-md-component=outdated]"),base=new URL("{{ base_url }}"),outdated=__md_get("__outdated",sessionStorage,base);!0===outdated&&el&&(el.hidden=!1)</script>

src/templates/assets/javascripts/integrations/version/index.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,11 @@ export function setupVersionSelector(
158158
document$.pipe(switchMap(() => current$))
159159
.subscribe(current => {
160160

161+
// Always scope outdate version banner to the base URL of the site
162+
const base = new URL(config.base)
163+
161164
/* Check if version state was already determined */
162-
let outdated = __md_get("__outdated", sessionStorage)
165+
let outdated = __md_get("__outdated", sessionStorage, base)
163166
if (outdated === null) {
164167
outdated = true
165168

@@ -177,7 +180,7 @@ export function setupVersionSelector(
177180
}
178181

179182
/* Persist version state in session storage */
180-
__md_set("__outdated", outdated, sessionStorage)
183+
__md_set("__outdated", outdated, sessionStorage, base)
181184
}
182185

183186
/* Unhide outdated version banner */

src/templates/partials/javascripts/outdated.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<!-- Version warning -->
2424
<script>
2525
var el = document.querySelector("[data-md-component=outdated]")
26-
var outdated = __md_get("__outdated", sessionStorage)
26+
var base = new URL("{{ base_url }}");
27+
var outdated = __md_get("__outdated", sessionStorage, base)
2728
if (outdated === true && el)
2829
el.hidden = false
2930
</script>

0 commit comments

Comments
 (0)