Skip to content

Commit 638d019

Browse files
committed
Fixed search and details for Safari 10+
1 parent 3ded01c commit 638d019

File tree

17 files changed

+76
-46
lines changed

17 files changed

+76
-46
lines changed

material/assets/javascripts/bundle.54617339.min.js.map

-8
This file was deleted.

material/assets/javascripts/bundle.54617339.min.js renamed to material/assets/javascripts/bundle.d85bccd8.min.js

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

material/assets/javascripts/bundle.d85bccd8.min.js.map

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

material/assets/javascripts/workers/search.361d90f1.min.js renamed to material/assets/javascripts/workers/search.c0c1e814.min.js

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

material/assets/javascripts/workers/search.361d90f1.min.js.map renamed to material/assets/javascripts/workers/search.c0c1e814.min.js.map

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

material/assets/stylesheets/main.8002f318.min.css

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

material/assets/stylesheets/main.8002f318.min.css.map

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

material/assets/stylesheets/main.9d8e7b00.min.css

-9
This file was deleted.

material/assets/stylesheets/main.9d8e7b00.min.css.map

-1
This file was deleted.

material/base.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{% endif %}
3535
{% endblock %}
3636
{% block styles %}
37-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.9d8e7b00.min.css' | url }}">
37+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.8002f318.min.css' | url }}">
3838
{% if config.theme.palette %}
3939
{% set palette = config.theme.palette %}
4040
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.e6a45f82.min.css' | url }}">
@@ -184,7 +184,7 @@
184184
"base": base_url,
185185
"features": features,
186186
"translations": {},
187-
"search": "assets/javascripts/workers/search.361d90f1.min.js" | url
187+
"search": "assets/javascripts/workers/search.c0c1e814.min.js" | url
188188
} -%}
189189
{%- if config.extra.version -%}
190190
{%- set _ = app.update({ "version": config.extra.version }) -%}
@@ -213,7 +213,7 @@
213213
</script>
214214
{% endblock %}
215215
{% block scripts %}
216-
<script src="{{ 'assets/javascripts/bundle.54617339.min.js' | url }}"></script>
216+
<script src="{{ 'assets/javascripts/bundle.d85bccd8.min.js' | url }}"></script>
217217
{% for path in config["extra_javascript"] %}
218218
<script src="{{ path | url }}"></script>
219219
{% endfor %}

package-lock.json

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

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"upgrade:install": "npm install"
3939
},
4040
"dependencies": {
41+
"array-flat-polyfill": "^1.0.1",
4142
"clipboard": "^2.0.8",
4243
"escape-html": "^1.0.3",
4344
"focus-visible": "^5.2.0",

src/assets/javascripts/bundle.ts

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
* IN THE SOFTWARE.
2121
*/
2222

23+
import "array-flat-polyfill"
24+
import "focus-visible"
25+
import "unfetch/polyfill"
26+
import "url-polyfill"
27+
2328
import {
2429
EMPTY,
2530
NEVER,

src/assets/javascripts/integrations/search/worker/main/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
import lunr from "lunr"
2424

25+
import "~/polyfills"
26+
2527
import { Search, SearchIndexConfig } from "../../_"
2628
import {
2729
SearchMessage,

src/assets/javascripts/polyfills/index.ts

+14-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@
2020
* IN THE SOFTWARE.
2121
*/
2222

23-
import "focus-visible"
24-
import "unfetch/polyfill"
25-
import "url-polyfill"
26-
2723
/* ----------------------------------------------------------------------------
28-
* Custom polyfills
24+
* Polyfills
2925
* ------------------------------------------------------------------------- */
3026

3127
/* Polyfill for `Object.entries` */
@@ -40,8 +36,20 @@ if (!Object.entries)
4036
return data
4137
}
4238

39+
/* Polyfill for `Object.values` */
40+
if (!Object.values)
41+
Object.values = function (obj: object) {
42+
const data: string[] = []
43+
for (const key of Object.keys(obj))
44+
// @ts-expect-error - ignore property access warning
45+
data.push(obj[key])
46+
47+
/* Return values */
48+
return data
49+
}
50+
4351
/* Polyfill for `Element.scrollTo` */
44-
if (!Element.prototype.scrollTo)
52+
if (typeof Element !== "undefined" && !Element.prototype.scrollTo)
4553
Element.prototype.scrollTo = function (
4654
x?: ScrollToOptions | number, y?: number
4755
): void {

src/assets/stylesheets/main/extensions/pymdownx/_details.scss

+7-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,13 @@
102102
}
103103
}
104104

105-
// Hide native details marker - Safari (iOS and macOS) does not seem to
106-
// like :is() on details elements, so just go with a selector list.
107-
&::marker,
105+
// Hide native details marker - modern
106+
&::marker {
107+
display: none;
108+
}
109+
110+
// Hide native details marker - legacy, must be split into a seprate rule,
111+
// so older browsers don't consider the selector list as invalid
108112
&::-webkit-details-marker {
109113
display: none;
110114
}

src/assets/stylesheets/main/layout/_search.scss

+7-2
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,13 @@
583583
background-color: var(--md-accent-fg-color--transparent);
584584
}
585585

586-
// Hide native details marker
587-
&::marker,
586+
// Hide native details marker - modern
587+
&::marker {
588+
display: none;
589+
}
590+
591+
// Hide native details marker - legacy, must be split into a seprate rule,
592+
// so older browsers don't consider the selector list as invalid
588593
&::-webkit-details-marker {
589594
display: none;
590595
}

0 commit comments

Comments
 (0)