From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 24 May 2020 08:46:12 +0000 (+0200)
Subject: Use new popover improvements for anchor template plugin
X-Git-Tag: 5.3.0_Alpha_1~20
X-Git-Url: https://git.stricted.de/?p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git;a=commitdiff_plain;h=ce8c322f5c788c33d62fa95612be3f8350d9ec11

Use new popover improvements for anchor template plugin

See WoltLab/WCF#3318
---

diff --git a/files/js/WCF.Conversation.js b/files/js/WCF.Conversation.js
index d30c839..c0b1865 100644
--- a/files/js/WCF.Conversation.js
+++ b/files/js/WCF.Conversation.js
@@ -1186,6 +1186,7 @@ WCF.Conversation.Label.Manager = Class.extend({
  * Provides a flexible conversation preview.
  * 
  * @see	WCF.Popover
+ * @deprecated  5.3     handled via `WoltLabSuite/Core/Controller/Popover`
  */
 WCF.Conversation.Preview = WCF.Popover.extend({
 	/**
diff --git a/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js b/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
index 5456ff1..d7e9e85 100644
--- a/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
+++ b/files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
@@ -66,7 +66,7 @@ define(['Ajax', 'EventKey', 'Language', 'Ui/Dialog', 'Ui/Notification'], functio
 		 */
 		_getCurrentValue: function () {
 			var value = '';
-			elBySelAll('.jsConversationSubject[data-conversation-id="' + _objectId + '"], .conversationLink[data-conversation-id="' + _objectId + '"]', undefined, function (subject) {
+			elBySelAll('.jsConversationSubject[data-conversation-id="' + _objectId + '"], .conversationLink[data-object-id="' + _objectId + '"]', undefined, function (subject) {
 				value = subject.textContent;
 			});
 			
@@ -76,7 +76,7 @@ define(['Ajax', 'EventKey', 'Language', 'Ui/Dialog', 'Ui/Notification'], functio
 		_ajaxSuccess: function (data) {
 			UiDialog.close(this);
 			
-			elBySelAll('.jsConversationSubject[data-conversation-id="' + _objectId + '"], .conversationLink[data-conversation-id="' + _objectId + '"]', undefined, function (subject) {
+			elBySelAll('.jsConversationSubject[data-conversation-id="' + _objectId + '"], .conversationLink[data-object-id="' + _objectId + '"]', undefined, function (subject) {
 				subject.textContent = data.returnValues.subject;
 			});
 			
diff --git a/files/lib/data/conversation/Conversation.class.php b/files/lib/data/conversation/Conversation.class.php
index 51b93fc..98d11bf 100644
--- a/files/lib/data/conversation/Conversation.class.php
+++ b/files/lib/data/conversation/Conversation.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\data\conversation;
 use wcf\data\conversation\message\ConversationMessage;
+use wcf\data\IPopoverObject;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserProfile;
 use wcf\data\DatabaseObject;
-use wcf\data\ITitledLinkObject;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
 use wcf\system\conversation\ConversationHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
@@ -48,7 +48,7 @@ use wcf\util\ArrayUtil;
  * @property-read	integer|null	$leftAt			timestamp at which the user left the conversation or `0` if they did not leave the conversation; is `null` if the conversation has not been fetched via `UserConversationList`
  * @property-read	integer|null	$lastMessageID		id of the last message written before the user left the conversation or `0` if they did not leave the conversation; is `null` if the conversation has not been fetched via `UserConversationList`
  */
-class Conversation extends DatabaseObject implements IRouteController, ITitledLinkObject {
+class Conversation extends DatabaseObject implements IPopoverObject, IRouteController {
 	/**
 	 * default participation state
 	 * @var	integer
@@ -420,6 +420,13 @@ class Conversation extends DatabaseObject implements IRouteController, ITitledLi
 		return $this->isActiveParticipant;
 	}
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function getPopoverLinkClass() {
+		return 'conversationLink';
+	}
+	
 	/**
 	 * Returns true if the given user id (default: current user) is participant
 	 * of all given conversation ids.
diff --git a/files/lib/data/conversation/ConversationAction.class.php b/files/lib/data/conversation/ConversationAction.class.php
index 4af7126..9a1dec1 100644
--- a/files/lib/data/conversation/ConversationAction.class.php
+++ b/files/lib/data/conversation/ConversationAction.class.php
@@ -6,6 +6,7 @@ use wcf\data\conversation\message\ConversationMessageList;
 use wcf\data\conversation\message\SimplifiedViewableConversationMessageList;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\IClipboardAction;
+use wcf\data\IPopoverAction;
 use wcf\data\IVisitableObjectAction;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\conversation\ConversationHandler;
@@ -31,7 +32,7 @@ use wcf\system\WCF;
  * @method	ConversationEditor[]	getObjects()
  * @method	ConversationEditor	getSingleObject()
  */
-class ConversationAction extends AbstractDatabaseObjectAction implements IClipboardAction, IVisitableObjectAction {
+class ConversationAction extends AbstractDatabaseObjectAction implements IClipboardAction, IPopoverAction, IVisitableObjectAction {
 	/**
 	 * @inheritDoc
 	 */
@@ -433,11 +434,9 @@ class ConversationAction extends AbstractDatabaseObjectAction implements IClipbo
 	}
 	
 	/**
-	 * Validates the get message preview action.
-	 * 
-	 * @throws	PermissionDeniedException
+	 * @inheritDoc
 	 */
-	public function validateGetMessagePreview() {
+	public function validateGetPopover() {
 		$this->conversation = $this->getSingleObject();
 		if (!Conversation::isParticipant([$this->conversation->conversationID])) {
 			throw new PermissionDeniedException();
@@ -445,25 +444,40 @@ class ConversationAction extends AbstractDatabaseObjectAction implements IClipbo
 	}
 	
 	/**
-	 * Returns a preview of a message in a specific conversation.
-	 * 
-	 * @return	string[]
+	 * @inheritDoc
 	 */
-	public function getMessagePreview() {
+	public function getPopover() {
 		$messageList = new SimplifiedViewableConversationMessageList();
-		
 		$messageList->getConditionBuilder()->add("conversation_message.messageID = ?", [$this->conversation->firstMessageID]);
 		$messageList->readObjects();
-		$messages = $messageList->getObjects();
 		
-		WCF::getTPL()->assign([
-			'message' => reset($messages)
-		]);
 		return [
-			'template' => WCF::getTPL()->fetch('conversationMessagePreview')
+			'template' => WCF::getTPL()->fetch('conversationMessagePreview', 'wcf', [
+				'message' => $messageList->getSingleObject(),
+			]),
 		];
 	}
 	
+	/**
+	 * Validates the get message preview action.
+	 * 
+	 * @throws	PermissionDeniedException
+	 * @deprecated  5.3     Use `validateGetPopover()` instead.
+	 */
+	public function validateGetMessagePreview() {
+		$this->validateGetPopover();
+	}
+	
+	/**
+	 * Returns a preview of a message in a specific conversation.
+	 * 
+	 * @return	string[]
+	 * @deprecated  5.3     Use `getPopover()` instead.
+	 */
+	public function getMessagePreview() {
+		return $this->getPopover();
+	}
+	
 	/**
 	 * Validates parameters to close conversations.
 	 * 
diff --git a/language/de.xml b/language/de.xml
index 9c865e5..fe3abf7 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -182,7 +182,7 @@
 		<item name="wcf.moderation.type.com.woltlab.wcf.conversation.message"><![CDATA[Konversation]]></item>
 	</category>
 	<category name="wcf.page">
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Konversation <a href="{link controller='Conversation' object=$conversation}{/link}" class="conversationLink" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</a>]]></item>
+		<item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Konversation {anchor object=$conversation class='conversationLink'}]]></item>
 	</category>
 	<category name="wcf.search">
 		<item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[Diese Konversation]]></item>
diff --git a/language/en.xml b/language/en.xml
index c028c0e..209ba2d 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -182,7 +182,7 @@
 		<item name="wcf.moderation.type.com.woltlab.wcf.conversation.message"><![CDATA[Conversation]]></item>
 	</category>
 	<category name="wcf.page">
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Conversation <a href="{link controller='Conversation' object=$conversation}{/link}" class="conversationLink" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</a>]]></item>
+		<item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Conversation {anchor object=$conversation class='conversationLink'}]]></item>
 	</category>
 	<category name="wcf.search">
 		<item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[This Conversation]]></item>
diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index 58c6618..0d45e3b 100644
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -201,7 +201,7 @@
 							{/hascontent}
 								
 							<h3>
-								<a href="{if $conversation->isNew()}{link controller='Conversation' object=$conversation}action=firstNew{/link}{else}{link controller='Conversation' object=$conversation}{/link}{/if}" class="conversationLink messageGroupLink" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</a>
+								<a href="{if $conversation->isNew()}{link controller='Conversation' object=$conversation}action=firstNew{/link}{else}{$conversation->getLink()}{/if}" class="conversationLink messageGroupLink" data-object-id="{@$conversation->conversationID}">{$conversation->subject}</a>
 								{if $conversation->replies}
 									<span class="badge messageGroupCounterMobile">{@$conversation->replies|shortUnit}</span>
 								{/if}
@@ -296,7 +296,7 @@
 
 <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Conversation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
 <script data-relocate="true">
-	require(['Language', 'WoltLabSuite/Core/Ui/ItemList/User'], function(Language, UiItemListUser) {
+	require(['Language', 'WoltLabSuite/Core/Controller/Popover', 'WoltLabSuite/Core/Ui/ItemList/User'], function(Language, ControllerPopover, UiItemListUser) {
 		Language.addObject({
 			'wcf.conversation.edit.addParticipants': '{lang}wcf.conversation.edit.addParticipants{/lang}',
 			'wcf.conversation.edit.assignLabel': '{lang}wcf.conversation.edit.assignLabel{/lang}',
@@ -322,7 +322,6 @@
 		
 		new WCF.Conversation.Clipboard($editorHandler);
 		new WCF.Conversation.Label.Manager('{link controller='ConversationList' encode=false}{if $filter}filter={@$filter}&{/if}{if !$participants|empty}participants={implode from=$participants item=participant}{$participant|rawurlencode}{/implode}&{/if}sortField={$sortField}&sortOrder={$sortOrder}&pageNo={@$pageNo}{/link}');
-		new WCF.Conversation.Preview();
 		new WCF.Conversation.MarkAsRead();
 		new WCF.Conversation.MarkAllAsRead();
 		
@@ -335,6 +334,12 @@
 			excludedSearchValues: ['{$__wcf->user->username|encodeJS}'],
 			maxItems: 20
 		});
+		
+		ControllerPopover.init({
+			className: 'conversationLink',
+			dboAction: 'wcf\\data\\conversation\\ConversationAction',
+			identifier: 'com.woltlab.wcf.conversation'
+		});
 	});
 </script>