From: Cyperghost <olaf_schmitz_1@t-online.de> Date: Wed, 23 Oct 2024 06:38:37 +0000 (+0200) Subject: Merge branch 'refs/heads/6.2' into fancybox X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0815a998e2f935840dea4bced85f04a4a26b1b2b;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'refs/heads/6.2' into fancybox # Conflicts: # package-lock.json # package.json --- 0815a998e2f935840dea4bced85f04a4a26b1b2b diff --cc package-lock.json index f6ea73f7e8,560cbf1983..878f8889e1 --- a/package-lock.json +++ b/package-lock.json @@@ -7,14 -7,13 +7,14 @@@ "name": "@woltlab/wcf", "dependencies": { "@ckeditor/ckeditor5-inspector": "^4.1.0", + "@fancyapps/ui": "^5.0.36", - "@googlemaps/markerclusterer": "^2.0.15", - "@types/facebook-js-sdk": "^3.3.7", - "@types/google.maps": "^3.54.0", - "@types/jquery": "^3.5.18", - "@types/pica": "^5.1.3", - "@types/prismjs": "^1.26.0", - "@types/twitter-for-web": "0.0.3", + "@googlemaps/markerclusterer": "2.0.15", + "@types/facebook-js-sdk": "^3.3.12", + "@types/google.maps": "^3.58.1", + "@types/jquery": "^3.5.30", + "@types/pica": "5.1.3", + "@types/prismjs": "^1.26.4", + "@types/twitter-for-web": "0.0.6", "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#efa5ffdc4a094c55ef015b29c9d5024649a8ea32", "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea", "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3", @@@ -765,19 -847,38 +848,43 @@@ } }, "node_modules/@eslint/js": { - "version": "8.48.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", - "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", + "version": "9.11.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz", + "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz", + "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@fancyapps/ui": { + "version": "5.0.36", + "resolved": "https://registry.npmjs.org/@fancyapps/ui/-/ui-5.0.36.tgz", + "integrity": "sha512-GMygQzp1MBTFNTT6AzpbL6pXTD6bTxwjmmpI1fe8Ozmmiseu8/g82Sudl1YhcbZmS4bJgaBOF5THDFGpXQ1fDw==" + }, "node_modules/@googlemaps/markerclusterer": { "version": "2.0.15", "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz", diff --cc package.json index 97bdfd7739,bb4f7f7673..8b49881fe4 --- a/package.json +++ b/package.json @@@ -14,14 -14,13 +14,14 @@@ }, "dependencies": { "@ckeditor/ckeditor5-inspector": "^4.1.0", + "@fancyapps/ui": "^5.0.36", - "@googlemaps/markerclusterer": "^2.0.15", - "@types/facebook-js-sdk": "^3.3.7", - "@types/google.maps": "^3.54.0", - "@types/jquery": "^3.5.18", - "@types/pica": "^5.1.3", - "@types/prismjs": "^1.26.0", - "@types/twitter-for-web": "0.0.3", + "@googlemaps/markerclusterer": "2.0.15", + "@types/facebook-js-sdk": "^3.3.12", + "@types/google.maps": "^3.58.1", + "@types/jquery": "^3.5.30", + "@types/pica": "5.1.3", + "@types/prismjs": "^1.26.4", + "@types/twitter-for-web": "0.0.6", "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#efa5ffdc4a094c55ef015b29c9d5024649a8ea32", "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea", "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3", diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/BootstrapFrontend.js index 2534d80d96,2ec14797d0..8e7d955df1 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/BootstrapFrontend.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/BootstrapFrontend.js @@@ -5,10 -5,10 +5,10 @@@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> */ -define(["require", "exports", "tslib", "./BackgroundQueue", "./Bootstrap", "./Ui/User/Ignore", "./Ui/Page/Header/Menu", "./Ui/Message/UserConsent", "./Ui/Message/Share/Dialog", "./Ui/Message/Share/Providers", "./Ui/Feed/Dialog", "./User", "./Ui/Page/Menu/Main/Frontend", "./LazyLoader", "./Ajax/Backend", "./Notification/ServiceWorker"], function (require, exports, tslib_1, BackgroundQueue, Bootstrap, UiUserIgnore, UiPageHeaderMenu, UiMessageUserConsent, UiMessageShareDialog, Providers_1, UiFeedDialog, User_1, Frontend_1, LazyLoader_1, Backend_1, ServiceWorker_1) { +define(["require", "exports", "tslib", "./BackgroundQueue", "./Bootstrap", "./Ui/User/Ignore", "./Ui/Page/Header/Menu", "./Ui/Message/UserConsent", "./Ui/Message/Share/Dialog", "./Ui/Message/Share/Providers", "./Ui/Feed/Dialog", "./User", "./Ui/Page/Menu/Main/Frontend", "./LazyLoader", "./Ajax/Backend", "./Notification/ServiceWorker", "./Component/Image/Viewer"], function (require, exports, tslib_1, BackgroundQueue, Bootstrap, UiUserIgnore, UiPageHeaderMenu, UiMessageUserConsent, UiMessageShareDialog, Providers_1, UiFeedDialog, User_1, Frontend_1, LazyLoader_1, Backend_1, ServiceWorker_1, ImageViewer) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - exports.setup = void 0; + exports.setup = setup; BackgroundQueue = tslib_1.__importStar(BackgroundQueue); Bootstrap = tslib_1.__importStar(Bootstrap); UiUserIgnore = tslib_1.__importStar(UiUserIgnore);