Skip to content

Commit 853cc49

Browse files
dtdesigndtdesign
committed
Merge branch '6.2' into 6.3
2 parents f996941 + f35094d commit 853cc49

26 files changed

Lines changed: 509 additions & 654 deletions

File tree

‎com.woltlab.wcf/package.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
66
<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
77
<isapplication>1</isapplication>
8-
<version>6.2.1 dev 2</version>
9-
<date>2026-03-06</date>
8+
<version>6.2.2</version>
9+
<date>2026-03-09</date>
1010
</packageinformation>
1111

1212
<authorinformation>
@@ -98,9 +98,9 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
9898
<instruction type="script">acp/update_com.woltlab.wcf_6.2_cleanUpDsStore.php</instruction>
9999
</instructions>
100100

101-
<instructions type="update" fromversion="6.2.1 dev 1">
101+
<instructions type="update" fromversion="6.2.1">
102102
<instruction type="acpTemplate">acptemplates_update.tar</instruction>
103103
<instruction type="file">files_update.tar</instruction>
104-
<instruction type="template">templates_update.tar</instruction>
104+
<instruction type="language"/>
105105
</instructions>
106106
</package>

‎com.woltlab.wcf/templates/shared_imageViewer.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
stylesheet = document.createElement("link");
3838
stylesheet.rel = "stylesheet";
3939
stylesheet.type = "text/css";
40-
stylesheet.href = "{$__wcf->getPath()}style/fancybox.css";
40+
stylesheet.href = "{$__wcf->getPath()}style/fancybox.css?t={LAST_UPDATE_TIME}";
4141
stylesheet.id = "fancybox-stylesheet";
4242
4343
document.querySelector('link[rel="stylesheet"]').before(stylesheet);

‎package-lock.json‎

Lines changed: 329 additions & 611 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
"bundle-web-components": "npx esbuild ts/WoltLabSuite/WebComponent/index.ts --minify --bundle --watch --outfile=wcfsetup/install/files/js/WoltLabSuite/WebComponent.min.js"
55
},
66
"devDependencies": {
7-
"@typescript-eslint/eslint-plugin": "^8.51.0",
8-
"@typescript-eslint/parser": "^8.51.0",
9-
"esbuild": "^0.27.2",
10-
"eslint": "^9.39.2",
7+
"@typescript-eslint/eslint-plugin": "^8.57.0",
8+
"@typescript-eslint/parser": "^8.57.0",
9+
"esbuild": "^0.27.3",
10+
"eslint": "^10.0.3",
1111
"eslint-config-prettier": "^10.1.8",
12-
"prettier": "^3.7.4",
12+
"prettier": "^3.8.1",
1313
"typescript": "^5.9.3"
1414
},
1515
"dependencies": {
1616
"@ckeditor/ckeditor5-inspector": "^5.0.0",
17-
"@fancyapps/ui": "^6.1.7",
17+
"@fancyapps/ui": "^6.1.13",
1818
"@googlemaps/markerclusterer": "2.6.2",
1919
"@types/facebook-js-sdk": "^3.3.12",
2020
"@types/google.maps": "^3.58.1",
2121
"@types/grecaptcha": "^3.0.9",
2222
"@types/jquery": "^3.5.33",
2323
"@types/pica": "5.1.3",
24-
"@types/prismjs": "^1.26.5",
24+
"@types/prismjs": "^1.26.6",
2525
"@types/sortablejs": "^1.15.9",
2626
"@types/supercluster": "^7.1.3",
2727
"@types/twitter-for-web": "0.0.6",
2828
"@woltlab/editor": "git+https://github.com/WoltLab/editor.git#be0fc99f19cdcdbaac62d02f3d4928b10249689c",
2929
"@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
3030
"@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
3131
"cropperjs": "2.1.0",
32-
"exifreader": "^4.33.1",
33-
"focus-trap": "^7.7.1",
32+
"exifreader": "^4.36.2",
33+
"focus-trap": "^8.0.0",
3434
"hash-wasm": "^4.12.0",
3535
"html-parsed-element": "^0.4.1",
3636
"perfect-scrollbar": "^1.5.6",
3737
"qr-creator": "^1.0.0",
3838
"reflect-metadata": "^0.2.2",
39-
"sortablejs": "^1.15.6",
39+
"sortablejs": "^1.15.7",
4040
"tabbable": "^6.4.0",
4141
"tslib": "^2.8.1"
4242
},

‎spiderList/spiderList.xml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,8 +1719,63 @@
17191719
<name>GPTBot</name>
17201720
<url>https://openai.com/gptbot</url>
17211721
</spider>
1722+
<spider ident="OAI-SearchBot/">
1723+
<name>OAI-SearchBot</name>
1724+
<url>https://openai.com/searchbot</url>
1725+
</spider>
1726+
<spider ident="ChatGPT-User/">
1727+
<name>ChatGPT-User</name>
1728+
<url>https://openai.com/bot</url>
1729+
</spider>
17221730
<spider ident="PerplexityBot/">
17231731
<name>PerplexityBot</name>
17241732
<url>https://perplexity.ai/perplexitybot</url>
17251733
</spider>
1734+
<spider ident="Perplexity-User/">
1735+
<name>Perplexity-User</name>
1736+
<url>https://perplexity.ai/perplexity-user</url>
1737+
</spider>
1738+
<spider ident="meta-webindexer/">
1739+
<name>Meta-WebIndexer</name>
1740+
<url>https://developers.facebook.com/docs/sharing/webmasters/web-crawlers</url>
1741+
</spider>
1742+
<spider ident="meta-externalads/">
1743+
<name>Meta-ExternalAds</name>
1744+
<url>https://developers.facebook.com/docs/sharing/webmasters/web-crawlers</url>
1745+
</spider>
1746+
<spider ident="meta-externalagent/">
1747+
<name>Meta-ExternalAgent</name>
1748+
<url>https://developers.facebook.com/docs/sharing/webmasters/web-crawlers</url>
1749+
</spider>
1750+
<spider ident="meta-externalfetcher/">
1751+
<name>Meta-ExternalFetcher</name>
1752+
<url>https://developers.facebook.com/docs/sharing/webmasters/web-crawlers</url>
1753+
</spider>
1754+
<spider ident="Bytespider/">
1755+
<name>Bytespider</name>
1756+
</spider>
1757+
<spider ident="PlagAwareBot/">
1758+
<name>PlagAware</name>
1759+
<url>https://www.plagaware.com/bot</url>
1760+
</spider>
1761+
<spider ident="DuckAssistBot/">
1762+
<name>DuckAssistBot</name>
1763+
<url>https://duckduckgo.com/duckduckgo-help-pages/results/duckassistbot</url>
1764+
</spider>
1765+
<spider ident="CCBot/">
1766+
<name>Common Crawl Bot</name>
1767+
<url>https://commoncrawl.org/faq</url>
1768+
</spider>
1769+
<spider ident="DataForSeoBot/">
1770+
<name>DataForSEO Link Bot</name>
1771+
<url>https://dataforseo.com/dataforseo-bot</url>
1772+
</spider>
1773+
<spider ident="Gemini-Deep-Research/">
1774+
<name>Gemini Deep Research</name>
1775+
<url>https://gemini.google/overview/deep-research/</url>
1776+
</spider>
1777+
<spider ident="quillbot/">
1778+
<name>Quillbot</name>
1779+
<url>https://quillbot.com/</url>
1780+
</spider>
17261781
</data>

‎ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* @since 6.0
1111
*/
1212

13+
import { tabbable } from "tabbable";
1314
import DomUtil from "../Dom/Util";
1415
import { adoptPageOverlayContainer, releasePageOverlayContainer } from "../Helper/PageOverlay";
1516
import * as Language from "../Language";
@@ -74,6 +75,11 @@ export class WoltlabCoreDialogElement extends HTMLElement {
7475

7576
adoptPageOverlayContainer(this.#dialog);
7677
scrollDisable();
78+
79+
const focusCandidates = tabbable(this.#dialog);
80+
if (focusCandidates.length > 0) {
81+
focusCandidates[0].focus();
82+
}
7783
}
7884

7985
close(): void {
@@ -304,7 +310,7 @@ export class WoltlabCoreDialogElement extends HTMLElement {
304310
}
305311

306312
if (this.#shouldClose()) {
307-
this.#detachDialog();
313+
this.close();
308314
} else {
309315
// Prevent the browser from closing the dialog.
310316
event.preventDefault();

‎wcfsetup/install/files/acp/templates/styleAdd.tpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@
5555
{/if}
5656
<li>
5757
{unsafe:$interactionContextMenu->render()}
58+
<script data-relocate="true">
59+
{
60+
const container = document.getElementById('{unsafe:$interactionContextMenu->getContainerID()|encodeJS}');
61+
container.addEventListener('interaction:invalidate', (event) => {
62+
if (event.detail.interaction === 'add-dark-mode') {
63+
setTimeout(() => {
64+
window.location.reload();
65+
}, 2000);
66+
}
67+
});
68+
}
69+
</script>
5870
</li>
5971
{/if}
6072
{event name='contentHeaderNavigation'}

‎wcfsetup/install/files/js/3rdParty/Sortable.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wcfsetup/install/files/js/3rdParty/exif-reader.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wcfsetup/install/files/js/3rdParty/fancybox/fancybox.umd.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)