Merge branch '5.3' into 5.4

diff --git a/ts/WoltLabSuite/Core/Ui/Redactor/Link.ts b/ts/WoltLabSuite/Core/Ui/Redactor/Link.ts
index 79ea1979d2a064771115838793af6483f6f6c2b4..e6de9bf698e0004e5d5b68f11f6af10c2d9a5ee3 100644 (file)
--- a/ts/WoltLabSuite/Core/Ui/Redactor/Link.ts
+++ b/ts/WoltLabSuite/Core/Ui/Redactor/Link.ts
@@ -71,10 +71,6 @@ class UiRedactorLink implements DialogCallbackObject {
             });
           }
         },
-        onShow: () => {
-          const url = document.getElementById("redactor-link-url") as HTMLInputElement;
-          url.focus();
-        },
       },
       source: `<dl>
           <dt>

diff --git a/ts/WoltLabSuite/Core/Ui/Redactor/Quote.ts b/ts/WoltLabSuite/Core/Ui/Redactor/Quote.ts
index ad379d9ddec595b356042d2b7982ff72f6223b51..5afd1f9ef6bf89e89a17438ed12c1e4b2c278c5f 100644 (file)
--- a/ts/WoltLabSuite/Core/Ui/Redactor/Quote.ts
+++ b/ts/WoltLabSuite/Core/Ui/Redactor/Quote.ts
@@ -249,7 +249,9 @@ class UiRedactorQuote {
       id: id,
       options: {
         onClose: () => {
-          this._editor.selection.restore();
+          window.setTimeout(() => {
+            this._editor.selection.restore();
+          }, 100);
 
           UiDialog.destroy(this);
         },

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
index 930f267434798f97b42a7ccdd6198fa1d4ec90af..f39317056d7e9bab08d3b5a7ec82daa4ac8fef51 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
@@ -267,7 +267,7 @@ $.Redactor.prototype.WoltLabClean = function() {
                                                var fontSize = span.style.getPropertyValue('font-size');
                                                
                                                var activeStyles = (color ? 1 : 0) + (fontFamily ? 1 : 0) + (fontSize ? 1 : 0);
-                                               while (activeStyles > 1) {
+                                               while (activeStyles > 0) {
                                                        if (this.opts.pastePlainText) {
                                                                span.style.removeProperty('color');
                                                                span.style.removeProperty('font-family');

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
index 7c3c77b7deb86dc89dcd62f86103eb60602f4bb1..f1956bc9d333aef49345215693fedda5a4c38d78 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
@@ -57,10 +57,6 @@ define(["require", "exports", "tslib", "../../Dom/Util", "../../Language", "../D
                             });
                         }
                     },
-                    onShow: () => {
-                        const url = document.getElementById("redactor-link-url");
-                        url.focus();
-                    },
                 },
                 source: `<dl>
           <dt>

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js
index 9d22917eb6259b8bb6be7af00c6a1fddbfcad84b..02d8bc2dd933dad272eec4941892f42ee7d09d73 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js
@@ -193,7 +193,9 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../Ev
                 id: id,
                 options: {
                     onClose: () => {
-                        this._editor.selection.restore();
+                        window.setTimeout(() => {
+                            this._editor.selection.restore();
+                        }, 100);
                         Dialog_1.default.destroy(this);
                     },
                     onSetup: () => {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 8d0a6f9002d0cfe3a98aef53a047e83d61fc52c8..888f69aaf8a2c8d0acac2c81ca4c55e784723e85 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -412,7 +412,7 @@
        <category name="wcf.acp.devtools">
                <item name="wcf.acp.devtools.project.add"><![CDATA[Projekt hinzufügen]]></item>
                <item name="wcf.acp.devtools.project.edit"><![CDATA[Projekt bearbeiten]]></item>
-               <item name="wcf.acp.devtools.project.introduction"><![CDATA[Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}beachte{else}beachten Sie{/if} die <a href="https://docs.woltlab.com/getting-started_quick-start.html#developer-tools" class="externalURL">Hinweise zur Benutzung</a> in der Entwickler-Dokumentation.]]></item>
+               <item name="wcf.acp.devtools.project.introduction"><![CDATA[Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}beachte{else}beachten Sie{/if} die <a href="https://docs.woltlab.com/latest/getting-started/#developer-tools" class="externalURL">Hinweise zur Benutzung</a> in der Entwickler-Dokumentation.]]></item>
                <item name="wcf.acp.devtools.project.list"><![CDATA[Projekte]]></item>
                <item name="wcf.acp.devtools.project.name"><![CDATA[Name]]></item>
                <item name="wcf.acp.devtools.project.name.error.notUnique"><![CDATA[Der Name wird bereits von einem anderen Projekt verwendet.]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ba88751f93fbfadf67c258d510a10f54485c2623..3b6d47dc4ee2caf8b520a8af50901cb96b34fbdf 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -389,7 +389,7 @@
        <category name="wcf.acp.devtools">
                <item name="wcf.acp.devtools.project.add"><![CDATA[Add Project]]></item>
                <item name="wcf.acp.devtools.project.edit"><![CDATA[Edit Project]]></item>
-               <item name="wcf.acp.devtools.project.introduction"><![CDATA[Please read the <a href="https://docs.woltlab.com/getting-started_quick-start.html#developer-tools" class="externalURL">usage instructions</a> in the developer documentation.]]></item>
+               <item name="wcf.acp.devtools.project.introduction"><![CDATA[Please read the <a href="https://docs.woltlab.com/latest/getting-started/#developer-tools" class="externalURL">usage instructions</a> in the developer documentation.]]></item>
                <item name="wcf.acp.devtools.project.list"><![CDATA[Projects]]></item>
                <item name="wcf.acp.devtools.project.name"><![CDATA[Name]]></item>
                <item name="wcf.acp.devtools.project.name.error.notUnique"><![CDATA[The name is already used by another project.]]></item>