Skip to content

Commit 860c07e

Browse files
author
Erwin Dondorp
committed
WIP
1 parent 453afeb commit 860c07e

37 files changed

Lines changed: 1267 additions & 430 deletions

saltgui/static/highlight-update.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,24 @@
55

66
set -x
77

8+
[ -x /usr/bin/unzip ] ||
9+
sudo apt install -y unzip
10+
11+
[ -x /usr/bin/wget ] ||
12+
sudo apt install -y wget
13+
814
[ -f /tmp/highlight.zip ] ||
915
wget -O /tmp/highlight.zip --header='Content-Type: application/json' --post-data='{"api":2,"languages":["json","yaml"]}' https://highlightjs.org/api/download
1016

1117
# remove previous edition
12-
git rm -r -f highlight
18+
git rm -r --force highlight
19+
1320
# just in case is was deleted or not yet there
1421
mkdir --parent highlight
22+
1523
# unzip the downloaded file
1624
(cd highlight && unzip -q /tmp/highlight.zip)
25+
1726
# add it to git
1827
git add highlight
1928

saltgui/static/highlight/DIGESTS.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ To do this you simply need to add the `integrity` attribute for each JavaScript
66

77
```html
88
<script
9-
src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.10.0/highlight.min.js"
10-
integrity="sha384-pGqTJHE/m20W4oDrfxTVzOutpMhjK3uP/0lReY0Jq/KInpuJSXUnk4WAYbciCLqT"></script>
9+
src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/highlight.min.js"
10+
integrity="sha384-5xdYoZ0Lt6Jw8GFfRP91J0jaOVUq7DGI1J5wIyNi0D+eHVdfUwHR4gW6kPsw489E"></script>
1111
<!-- including any other grammars you might need to load -->
1212
<script
13-
src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.10.0/languages/go.min.js"
14-
integrity="sha384-Mtb4EH3R9NMDME1sPQALOYR8KGqwrXAtmc6XGxDd0XaXB23irPKsuET0JjZt5utI"></script>
13+
src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/languages/go.min.js"
14+
integrity="sha384-HdearVH8cyfzwBIQOjL/6dSEmZxQ5rJRezN7spps8E7iu+R6utS8c2ab0AgBNFfH"></script>
1515
```
1616

1717
The full list of digests for every file can be found below.
1818

1919
### Digests
2020

2121
```
22-
sha384-R87hRh4kF8+iz2sB6FvLrfR0XZBohjFXeJKIXld1Eji2UVi+M2+OIgJKma/9Ko6u /es/languages/json.js
23-
sha384-QFDPNpqtrgZCuAr70TZJFM4VCY+xNnyGKwJw2EsWIBJOVcWAns9PHcLzecyDVv+x /es/languages/json.min.js
24-
sha384-40MP6/ECSjYaTAIf+/ibE2FPeFPQ53WbASndXxMOcXiQtgLbGXUStZVuPSngp7OD /es/languages/yaml.js
25-
sha384-vXmhozexi2dHQBoniIEbWI5ZqDxyVfUs96BUGpqjWL1aberSp9pyxbvK8WCNASGB /es/languages/yaml.min.js
26-
sha384-psmmPlbfEWGyvRapexDqkVTgNz7Y1xvlGdLNWQSafI4GFQYFDXPZxVXH1laU4n6l /languages/json.js
27-
sha384-Bb6DhE3tUpBROwypL78TbhRUs9QbCt2GxcxVSYglt2l3MefrYkm4CfwjfWhRfQaX /languages/json.min.js
28-
sha384-3KIoWvJ5JGRH35WAkzreEebY8sug+ZWeaOPS2r1KIfznEU9TtPFpxX6sIgtaiA9G /languages/yaml.js
29-
sha384-bMkvdnz+wPu1ro0fqO3BaDWztc7RzSvw05MQFP6bhJKDcwpkrFYTfTFI9ndkP11l /languages/yaml.min.js
30-
sha384-K/lmlGQ1csQn1mpVy2e8KFC/I4UCJeKBL/puxNMhryz5acaA340QirqJpbtwfunZ /highlight.js
31-
sha384-wZNnxh6Gd4U6ufGOj7cOmK8M/H4Vfs81NXsomfxq45v4e3jiZL1dUYAn0GmlMJ+L /highlight.min.js
22+
sha384-8CRS96Xb/ZkZlQU+5ffA03XTN6/xY40QAnsXKB0Y+ow1vza1LAkRNPSrZqGSNo53 /es/languages/json.js
23+
sha384-UHzaYxI/rAo84TEK3WlG15gVfPk49XKax76Ccn9qPWYbUxePCEHxjGkV+xp9HcS/ /es/languages/json.min.js
24+
sha384-7HTgKp/l2rzlyrh5vUfbfZVy+Wx1lKO4iGmfqvakienApv21u55lo+Vi+iVg4jY0 /es/languages/yaml.js
25+
sha384-4smueUtgWTorlNLbaQIawnVCcIAuw82NetPOGWN5PbZT/pMr0rjvZXj0EUzJV1nr /es/languages/yaml.min.js
26+
sha384-pUlqdjoNePvHvdi7GVKJJnh/P2T3EvXXodl5j0JtTkbNC4DRH7gwGbcHFa84bFOP /languages/json.js
27+
sha384-3C+cPClJZgjKFYAb0bh35D7im2jasLzgk9eRix3t1c5pk1+x6b+bHghWcdrKwIo3 /languages/json.min.js
28+
sha384-6GXi9L5BnOWPU6bzwYL78Zscp23qyDdMLZpZvp4mLzvF2qt0eY/DfsPHiFVXq4hv /languages/yaml.js
29+
sha384-A/iMReLA0Bo3tLydBIoOQXQzYnrwL90jkHYUubrtERUGCbIuU7U0EHge0Xd2s5sr /languages/yaml.min.js
30+
sha384-Yp/vUCpkS0EI2vnV53fXBRaKuceNdRKuSTF7tHjuFTUfyw7cztpGzKjXn5LWF9bO /highlight.js
31+
sha384-PIWhKrgw58rWiXCBfVWaEH1cT4PJk0zkt1qLS0OzGDABdwTiZ3j17am5Q4v2cO4q /highlight.min.js
3232
```
3333

saltgui/static/highlight/es/core.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
Highlight.js v11.10.0 (git: 366a8bd012)
3-
(c) 2006-2024 Josh Goebel <hello@joshgoebel.com> and other contributors
2+
Highlight.js v11.11.1 (git: 08cb242e7d)
3+
(c) 2006-2025 Josh Goebel <hello@joshgoebel.com> and other contributors
44
License: BSD-3-Clause
55
*/
66
/* eslint-disable no-multi-assign */
@@ -1555,7 +1555,7 @@ function expandOrCloneMode(mode) {
15551555
return mode;
15561556
}
15571557

1558-
var version = "11.10.0";
1558+
var version = "11.11.1";
15591559

15601560
class HTMLInjectionError extends Error {
15611561
constructor(reason, html) {
@@ -2082,6 +2082,7 @@ const HLJS = function(hljs) {
20822082
// first handler (when ignoreIllegals is true)
20832083
if (match.type === "illegal" && lexeme === "") {
20842084
// advance so we aren't stuck in an infinite loop
2085+
modeBuffer += "\n";
20852086
return 1;
20862087
}
20872088

@@ -2375,8 +2376,17 @@ const HLJS = function(hljs) {
23752376
* auto-highlights all pre>code elements on the page
23762377
*/
23772378
function highlightAll() {
2379+
function boot() {
2380+
// if a highlight was requested before DOM was loaded, do now
2381+
highlightAll();
2382+
}
2383+
23782384
// if we are called too early in the loading process
23792385
if (document.readyState === "loading") {
2386+
// make sure the event listener is only added once
2387+
if (!wantsHighlight) {
2388+
window.addEventListener('DOMContentLoaded', boot, false);
2389+
}
23802390
wantsHighlight = true;
23812391
return;
23822392
}
@@ -2385,16 +2395,6 @@ const HLJS = function(hljs) {
23852395
blocks.forEach(highlightElement);
23862396
}
23872397

2388-
function boot() {
2389-
// if a highlight was requested before DOM was loaded, do now
2390-
if (wantsHighlight) highlightAll();
2391-
}
2392-
2393-
// make sure we are in the browser environment
2394-
if (typeof window !== 'undefined' && window.addEventListener) {
2395-
window.addEventListener('DOMContentLoaded', boot, false);
2396-
}
2397-
23982398
/**
23992399
* Register a language grammar module
24002400
*

0 commit comments

Comments
 (0)