Merge branch '6.1' into 6.2

Author: dtdesign

com.woltlab.wcf/templates/shared_trophyImage.tpl

@@ -6,4 +6,5 @@
 	class="trophyIcon{if $showTooltip} jsTooltip{/if}"
 	data-trophy-id="{$trophy->getObjectID()}"
 	loading="lazy"
+	alt="{$trophy->getTitle()}"
 />

com.woltlab.wcf/templates/shared_wysiwyg.tpl

@@ -9,7 +9,7 @@
 		stylesheet = document.createElement("link");
 		stylesheet.rel = "stylesheet";
 		stylesheet.type = "text/css";
-		stylesheet.href = "{$__wcf->getPath()}style/ckeditor5.css";
+		stylesheet.href = "{$__wcf->getPath()}style/ckeditor5.css?t={LAST_UPDATE_TIME}";
 		stylesheet.id = "ckeditor5-stylesheet";
 
 		document.querySelector('link[rel="stylesheet"]').before(stylesheet);

com.woltlab.wcf/templates/team.tpl

@@ -7,11 +7,11 @@
 			<p class="sectionDescription">{$team->getDescription()}</p>
 		</header>
 
-		<ol class="containerList userCardList">
+		<div class="userCardList">
 			{foreach from=$team->getMembers() item=user}
 				{include file='userCard'}
 			{/foreach}
-		</ol>
+		</div>
 	</section>
 {/foreach}
 

ts/WoltLabSuite/Core/Component/Comment/Add.ts

@@ -211,7 +211,6 @@ export class CommentAdd {
 export function setCommentEditorFeatures(textarea: HTMLTextAreaElement): void {
   listenToCkeditor(textarea).setupFeatures(({ features }) => {
     features.heading = false;
-    features.quoteBlock = false;
     features.spoiler = false;
     features.table = false;
   });

ts/WoltLabSuite/Core/Component/Comment/Response/Add.ts

@@ -12,13 +12,13 @@ import { getPhrase } from "../../../Language";
 import * as EventHandler from "../../../Event/Handler";
 import * as UiScroll from "../../../Ui/Scroll";
 import { CKEditor, getCkeditor } from "../../Ckeditor";
-import { listenToCkeditor } from "../../Ckeditor/Event";
 import User from "WoltLabSuite/Core/User";
 import { getGuestToken } from "../../GuestTokenDialog";
 import { createResponse } from "WoltLabSuite/Core/Api/Comments/Responses/CreateResponse";
 import { clearQuotesForEditor } from "WoltLabSuite/Core/Component/Quote/Storage";
 import { setActiveEditor } from "WoltLabSuite/Core/Component/Quote/Message";
 import { showSuccessSnackbar } from "../../Snackbar";
+import { setCommentEditorFeatures } from "../Add";
 
 type CallbackInsertResponse = (commentId: number, responseId: number) => void;
 
@@ -48,11 +48,7 @@ export class CommentResponseAdd {
       void this.#submit();
     });
 
-    listenToCkeditor(this.#textarea).setupFeatures(({ features }) => {
-      features.heading = false;
-      features.spoiler = false;
-      features.table = false;
-    });
+    setCommentEditorFeatures(this.#textarea);
   }
 
   show(commentId: number): void {

ts/WoltLabSuite/Core/Ui/Password.ts

@@ -38,7 +38,6 @@ function initElement(input: HTMLInputElement): void {
   button.type = "button";
   button.title = Language.get("wcf.global.form.password.button.show");
   button.classList.add("button", "inputSuffix", "jsTooltip");
-  button.setAttribute("aria-hidden", "true");
   inputAddon.appendChild(button);
 
   const icon = document.createElement("fa-icon");

ts/WoltLabSuite/Core/Ui/User/Trophy/List.ts

@@ -9,10 +9,11 @@
 
 import * as Ajax from "../../../Ajax";
 import { AjaxCallbackObject, AjaxCallbackSetup, DatabaseObjectActionResponse } from "../../../Ajax/Data";
-import { DialogCallbackObject, DialogData, DialogCallbackSetup } from "../../Dialog/Data";
-import DomChangeListener from "../../../Dom/Change/Listener";
-import UiDialog from "../../Dialog";
 import UiPagination from "../../Pagination";
+import { wheneverFirstSeen } from "WoltLabSuite/Core/Helper/Selector";
+import WoltlabCoreDialogElement from "WoltLabSuite/Core/Element/woltlab-core-dialog";
+import { dialogFactory } from "WoltLabSuite/Core/Component/Dialog";
+import { setInnerHtml } from "WoltLabSuite/Core/Dom/Util";
 
 class CacheData {
   private readonly cache = new Map<number, string>();
@@ -35,31 +36,20 @@ class CacheData {
   }
 }
 
-class UiUserTrophyList implements AjaxCallbackObject, DialogCallbackObject {
+class UiUserTrophyList implements AjaxCallbackObject {
   private readonly cache = new Map<number, CacheData>();
   private currentPageNo = 0;
   private currentUser = 0;
-  private readonly knownElements = new WeakSet<HTMLElement>();
+  #dialog: WoltlabCoreDialogElement | undefined = undefined;
 
   /**
    * Initializes the user trophy list.
    */
   constructor() {
-    DomChangeListener.add("WoltLabSuite/Core/Ui/User/Trophy/List", () => this.rebuild());
-
-    this.rebuild();
-  }
-
-  /**
-   * Adds event userTrophyOverlayList elements.
-   */
-  private rebuild(): void {
-    document.querySelectorAll(".userTrophyOverlayList").forEach((element: HTMLElement) => {
-      if (!this.knownElements.has(element)) {
-        element.addEventListener("click", (ev) => this.open(element, ev));
-
-        this.knownElements.add(element);
-      }
+    wheneverFirstSeen(".userTrophyOverlayList", (element) => {
+      element.addEventListener("click", (event) => {
+        this.open(element, event);
+      });
     });
   }
 
@@ -91,11 +81,18 @@ class UiUserTrophyList implements AjaxCallbackObject, DialogCallbackObject {
     }
 
     if (data && data.has(this.currentPageNo)) {
-      const dialog = UiDialog.open(this, data.get(this.currentPageNo)) as DialogData;
-      UiDialog.setTitle("userTrophyListOverlay", data.title);
+      if (this.#dialog === undefined) {
+        this.#dialog = dialogFactory().withoutContent().withoutControls();
+      }
+
+      setInnerHtml(this.#dialog.content, data.get(this.currentPageNo)!);
+
+      if (!this.#dialog.open) {
+        this.#dialog.show(data.title);
+      }
 
       if (data.pageCount > 1) {
-        const element = dialog.content.querySelector(".jsPagination") as HTMLElement;
+        const element = this.#dialog.content.querySelector(".jsPagination") as HTMLElement;
         if (element !== null) {
           new UiPagination(element, {
             activePage: this.currentPageNo,
@@ -135,16 +132,6 @@ class UiUserTrophyList implements AjaxCallbackObject, DialogCallbackObject {
       },
     };
   }
-
-  _dialogSetup(): ReturnType<DialogCallbackSetup> {
-    return {
-      id: "userTrophyListOverlay",
-      options: {
-        title: "",
-      },
-      source: null,
-    };
-  }
 }
 
 export = UiUserTrophyList;

wcfsetup/install/files/js/WCF.Combined.min.js

@@ -25,12 +25,6 @@ WCF.User.Profile.ActivityPointList = {
 	 */
 	_cache: { },
 
-	/**
-	 * dialog overlay
-	 * @var	jQuery
-	 */
-	_dialog: null,
-	
 	/**
 	 * initialization state
 	 * @var	boolean
@@ -52,23 +46,25 @@ WCF.User.Profile.ActivityPointList = {
 		}
 
 		this._cache = { };
-		this._dialog = null;
 		this._proxy = new WCF.Action.Proxy({
 			success: $.proxy(this._success, this)
 		});
 
 		this._init();
 
-		WCF.DOMNodeInsertedHandler.addCallback('WCF.User.Profile.ActivityPointList', $.proxy(this._init, this));
-		
 		this._didInit = true;
 	},
 
 	/**
 	 * Initializes display for activity points.
 	 */
 	_init: function() {
-		$('.activityPointsDisplay').removeClass('activityPointsDisplay').click($.proxy(this._click, this));
+		require(["WoltLabSuite/Core/Helper/Selector"], ({ wheneverFirstSeen }) => {
+			wheneverFirstSeen(".activityPointsDisplay", (element) => {
+				element.classList.remove("activityPointsDisplay");
+				element.addEventListener("click", (event) => this._click(event));
+			});
+		});
 	},
 
 	/**
@@ -99,16 +95,12 @@ WCF.User.Profile.ActivityPointList = {
 	 * @param	integer		userID
 	 */
 	_show: function(userID) {
-		if (this._dialog === null) {
-			this._dialog = $('<div>' + this._cache[userID] + '</div>').hide().appendTo(document.body);
-			this._dialog.wcfDialog({
-				title: WCF.Language.get('wcf.user.activityPoint')
-			});
-		}
-		else {
-			this._dialog.html(this._cache[userID]);
-			this._dialog.wcfDialog('open');
-		}
+		require(["WoltLabSuite/Core/Component/Dialog"], ({ dialogFactory }) => {
+			dialogFactory()
+				.fromHtml(this._cache[userID])
+				.withoutControls()
+				.show(WCF.Language.get("wcf.user.activityPoint"));
+		});
 	},
 
 	/**