From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 1 Mar 2017 15:15:51 +0000 (+0100)
Subject: Draft implementation for comments
X-Git-Tag: 3.1.0_Alpha_1~629
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53e22ab93f2e74cdb9bec37ac9bf199821d11211;p=GitHub%2FWoltLab%2FWCF.git

Draft implementation for comments

See #2222
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index dc6d9dc70c..45d5888da3 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -82,6 +82,10 @@
 			<name>com.woltlab.wcf.user.signature</name>
 			<definitionname>com.woltlab.wcf.message</definitionname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.comment</name>
+			<definitionname>com.woltlab.wcf.message</definitionname>
+		</type>
 		
 		<type>
 			<name>com.woltlab.wcf.bbcode.smiley</name>
diff --git a/com.woltlab.wcf/templates/commentListAddComment.tpl b/com.woltlab.wcf/templates/commentListAddComment.tpl
new file mode 100644
index 0000000000..fb8d280903
--- /dev/null
+++ b/com.woltlab.wcf/templates/commentListAddComment.tpl
@@ -0,0 +1,17 @@
+<li class="box48 jsCommentAdd jsOnly">
+	{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(48)}
+	<div class="commentListAddComment">
+		<textarea id="text" name="text" class="wysiwygTextarea"
+		          data-disable-attachments="true"
+		          data-support-mention="true"
+		></textarea>
+		{include file='wysiwyg' userProfileCommentList=$commentListContainerID}
+		
+		<div class="formSubmit">
+			<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
+			
+			{include file='messageFormPreviewButton' previewMessageObjectType='com.woltlab.wcf.comment' previewMessageObjectID=0}
+		</div>
+	</div>
+</li>
+
diff --git a/com.woltlab.wcf/templates/userProfileCommentList.tpl b/com.woltlab.wcf/templates/userProfileCommentList.tpl
index 7e3c3c574c..3c89728b99 100644
--- a/com.woltlab.wcf/templates/userProfileCommentList.tpl
+++ b/com.woltlab.wcf/templates/userProfileCommentList.tpl
@@ -2,6 +2,7 @@
 
 {if $commentCanAdd}
 	<ul id="userProfileCommentList" class="commentList containerList" data-can-add="true" data-object-id="{@$userID}" data-object-type-id="{@$commentObjectTypeID}" data-comments="{@$commentList->countObjects()}" data-last-comment-time="{@$lastCommentTime}">
+		{include file='commentListAddComment' commentListContainerID='userProfileCommentList'}
 		{include file='commentList'}
 	</ul>
 {else}
diff --git a/wcfsetup/install/files/js/WCF.Comment.js b/wcfsetup/install/files/js/WCF.Comment.js
index 634bf95dbb..5ca29ca3f4 100644
--- a/wcfsetup/install/files/js/WCF.Comment.js
+++ b/wcfsetup/install/files/js/WCF.Comment.js
@@ -332,13 +332,8 @@ WCF.Comment.Handler = Class.extend({
 	 * Initializes the UI components to add a comment.
 	 */
 	_initAddComment: function() {
-		// create UI
-		this._commentAdd = $('<li class="box48 jsCommentAdd">' + this._userAvatar + '<div /></li>').prependTo(this._container);
-		var $inputContainer = this._commentAdd.children('div');
-		var $input = $('<textarea placeholder="' + WCF.Language.get('wcf.comment.add') + '" maxlength="65535" class="long" />').appendTo($inputContainer).flexible();
-		$('<button class="small">' + WCF.Language.get('wcf.global.button.submit') + '</button>').click($.proxy(this._save, this)).appendTo($inputContainer);
-		
-		$input.keyup($.proxy(this._keyUp, this));
+		var button = elBySel('.jsCommentAdd .formSubmit button[data-type="save"]', this._commentAdd[0]);
+		if (button) button.addEventListener(WCF_CLICK_EVENT, this._save.bind(this));
 	},
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/comment/Comment.class.php b/wcfsetup/install/files/lib/data/comment/Comment.class.php
index 5223e47ae1..ab8b9163c6 100644
--- a/wcfsetup/install/files/lib/data/comment/Comment.class.php
+++ b/wcfsetup/install/files/lib/data/comment/Comment.class.php
@@ -24,6 +24,7 @@ use wcf\util\StringUtil;
  * @property-read	string		$message		comment message
  * @property-read	integer		$responses		number of responses on the comment
  * @property-read	string		$responseIDs		serialized array with the ids of the five latest comment responses
+ * @property-read       integer         $enableHtml             is 1 if HTML will rendered in the comment, otherwise 0
  */
 class Comment extends DatabaseObject implements IMessage {
 	use TUserContent;
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 4f1ad9df3c..958f3950e1 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -378,6 +378,7 @@ CREATE TABLE wcf1_comment (
 	message TEXT NOT NULL,
 	responses MEDIUMINT(7) NOT NULL DEFAULT '0',
 	responseIDs VARCHAR(255) NOT NULL DEFAULT '',
+	enableHtml TINYINT(1) NOT NULL DEFAULT 0,
 	
 	KEY (objectTypeID, objectID, time),
 	KEY lastCommentTime (userID, time)