From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 26 Nov 2014 00:20:33 +0000 (+0100)
Subject: Fixed a few issues related to attachment management
X-Git-Tag: 2.1.0_Beta_1~154
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=858eb61915636f18820a69a120369df9abdc732f;p=GitHub%2FWoltLab%2FWCF.git

Fixed a few issues related to attachment management
---

diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index 0eaec9ae78..5631945be0 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -1,7 +1,7 @@
 <div class="jsOnly formAttachmentContent container containerPadding" id="attachments_{if $wysiwygSelector|isset}{$wysiwygSelector}{else}text{/if}">
 	<ul class="formAttachmentList clearfix"{if !$attachmentHandler->getAttachmentList()|count} style="display: none"{/if}>
 		{foreach from=$attachmentHandler->getAttachmentList() item=$attachment}
-			<li class="box48" data-object-id="{@$attachment->attachmentID}">
+			<li class="box64" data-object-id="{@$attachment->attachmentID}" data-height="{@$attachment->height}" data-width="{@$attachment->width}">
 				{if $attachment->tinyThumbnailType}
 					<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail" />
 				{else}
@@ -14,9 +14,14 @@
 						<small>{@$attachment->filesize|filesize}</small>
 					</div>
 					
-					<ul>
-						<li><span class="icon icon16 icon-remove pointer jsTooltip jsDeleteButton " title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$attachment->attachmentID}" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}"></span></li>
-						<li><span class="icon icon16 icon-paste pointer jsTooltip jsButtonInsertAttachment" title="{lang}wcf.attachment.insert{/lang}" data-object-id="{@$attachment->attachmentID}"></span></li>
+					<ul class="buttonGroup">
+						<li><span class="button small jsDeleteButton" data-object-id="{@$attachment->attachmentID}" data-confirm-message="{lang}wcf.attachment.delete.sure{/lang}">{lang}wcf.global.button.delete{/lang}</span></li>
+						{if $attachment->isImage}
+							<li><span class="button small jsButtonAttachmentInsertThumbnail" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insertThumbnail{/lang}</span></li>
+							<li><span class="button small jsButtonAttachmentInsertFull" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insertFull{/lang}</span></li>
+						{else}
+							<li><span class="button small jsButtonInsertAttachment" data-object-id="{@$attachment->attachmentID}">{lang}wcf.attachment.insert{/lang}</span></li>
+						{/if}
 					</ul>
 				</div>
 			</li>
diff --git a/wcfsetup/install/files/js/WCF.Attachment.js b/wcfsetup/install/files/js/WCF.Attachment.js
index fcc66a13cd..59040dcfe9 100644
--- a/wcfsetup/install/files/js/WCF.Attachment.js
+++ b/wcfsetup/install/files/js/WCF.Attachment.js
@@ -58,7 +58,7 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 	 */
 	init: function(buttonSelector, fileListSelector, objectType, objectID, tmpHash, parentObjectID, maxUploads, wysiwygContainerID) {
 		this._super(buttonSelector, fileListSelector, 'wcf\\data\\attachment\\AttachmentAction', { multiple: true, maxUploads: maxUploads });
-		
+		console.debug(wysiwygContainerID);
 		this._autoInsert = [ ];
 		this._objectType = objectType;
 		this._objectID = objectID;
@@ -68,6 +68,8 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 		
 		this._buttonSelector.children('p.button').click($.proxy(this._validateLimit, this));
 		this._fileListSelector.find('.jsButtonInsertAttachment').click($.proxy(this._insert, this));
+		this._fileListSelector.find('.jsButtonAttachmentInsertThumbnail').click($.proxy(this._insert, this));
+		this._fileListSelector.find('.jsButtonAttachmentInsertFull').click($.proxy(this._insert, this));
 		
 		WCF.DOMNodeRemovedHandler.addCallback('WCF.Attachment.Upload', $.proxy(this._removeLimitError, this));
 		
@@ -187,16 +189,14 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 			this._buttonSelector.next('small.innerError').remove();
 		}
 		
-		var $listItems = this._fileListSelector.children();
+		var $listItems = this._fileListSelector.children('li');
 		if (!$listItems.filter(':not(.uploadFailed)').length) {
 			this._insertAllButton.hide();
 		}
 		
 		if (!$listItems.length) {
 			setTimeout((function() {
-				if (!this._fileListSelector.children('li:not(.uploadFailed)').length) {
-					this._fileListSelector.wcfBlindOut();
-				}
+				this._fileListSelector.wcfBlindOut();
 			}).bind(this), 250);
 		}
 	},