From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 25 Dec 2016 10:59:23 +0000 (+0100)
Subject: Suppress drag&drop indication if unsupported
X-Git-Tag: 3.0.0_RC_3~51
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=223f2245dcdf369de66eb210cd3d6923d7ab8438;p=GitHub%2FWoltLab%2FWCF.git

Suppress drag&drop indication if unsupported
---

diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl
index be3559d5a1..086bad30d9 100644
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@ -1,4 +1,4 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10"{if $option->required} required{/if}>{$value}</textarea>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10"{if $option->required} required{/if} class="wysiwygTextarea" data-disable-attachments="true">{$value}</textarea>
 {include file='wysiwyg' wysiwygSelector=$option->optionName}
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index a37f96009f..91266dfca5 100644
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -28,7 +28,7 @@
 			<dl class="wide{if $errorField == 'text'} formError{/if}">
 				<dt><label for="text">{lang}wcf.user.signature{/lang}</label></dt>
 				<dd>
-					<textarea id="text" class="wysiwygTextarea" name="text" rows="20" cols="40">{$text}</textarea>
+					<textarea id="text" class="wysiwygTextarea" name="text" rows="20" cols="40" data-disable-attachments="true">{$text}</textarea>
 					{if $errorField == 'text'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 7aec555ddd..4b4190dc04 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -212,6 +212,7 @@
 				],
 				toolbarFixed: false,
 				woltlab: {
+					attachments: (elDataBool(element, 'disable-attachments') === false),
 					autosave: autosave,
 					allowedInlineStyles: allowedInlineStyles,
 					buttons: buttonOptions,
diff --git a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
index f9b79b4245..65fce79177 100644
--- a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
@@ -26,7 +26,7 @@
 {if $boxType == 'text'}
 	<textarea name="content[{@$languageID}]" id="content{@$languageID}"
 		{if $boxType == 'text'}
-			class="wysiwygTextarea" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
+			class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
 		{/if}
 	>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
 	{include file='wysiwyg' wysiwygSelector='content'|concat:$languageID}
@@ -34,7 +34,7 @@
 	<div dir="ltr">
 		<textarea name="content[{@$languageID}]" id="content{@$languageID}"
 			{if $boxType == 'text'}
-				class="wysiwygTextarea" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
+				class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
 			{/if}
 		>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
index 15915f4aed..ec596752f1 100644
--- a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
@@ -30,7 +30,7 @@
 {if $pageType == 'text'}
 	<textarea name="content[{@$languageID}]" id="{@$__pageContentID}"
 		{if $pageType == 'text'}
-			class="wysiwygTextarea" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
+			class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
 		{/if}
 	>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
 	
@@ -47,8 +47,8 @@
 {else}
 	<div dir="ltr">
 		<textarea name="content[{@$languageID}]" id="{@$__pageContentID}"
-			{if $pageType == 'text'}
-				class="wysiwygTextarea" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
+		        {if $pageType == 'text'}
+				class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
 			{/if}
 		>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/messageOptionType.tpl b/wcfsetup/install/files/acp/templates/messageOptionType.tpl
index 4c314f0ca7..b81e0bb4f2 100644
--- a/wcfsetup/install/files/acp/templates/messageOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/messageOptionType.tpl
@@ -1,2 +1,2 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10" class="wysiwygTextarea" data-disable-attachments="true">{$value}</textarea>
 {include file='wysiwyg' wysiwygSelector=$option->optionName}
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 7148f0b6d3..3951ea4ea8 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -284,7 +284,7 @@
 					<dl>
 						<dt><label for="signature">{lang}wcf.user.signature{/lang}</label></dt>
 						<dd>
-							<textarea name="signature" id="signature" cols="40" rows="10">{$signature}</textarea>
+							<textarea name="signature" id="signature" cols="40" rows="10" class="wysiwygTextarea" data-disable-attachments="true">{$signature}</textarea>
 							{include file='wysiwyg' wysiwygSelector='signature'}
 						</dd>
 					</dl>
diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 7aec555ddd..4b4190dc04 100644
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -212,6 +212,7 @@
 				],
 				toolbarFixed: false,
 				woltlab: {
+					attachments: (elDataBool(element, 'disable-attachments') === false),
 					autosave: autosave,
 					allowedInlineStyles: allowedInlineStyles,
 					buttons: buttonOptions,
diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabAttachment.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabAttachment.js
index e3833dd8c0..3cab79e2b2 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabAttachment.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabAttachment.js
@@ -3,6 +3,10 @@ $.Redactor.prototype.WoltLabAttachment = function() {
 	
 	return {
 		init: function() {
+			if (!this.opts.woltlab.attachments) {
+				return;
+			}
+			
 			require(['EventHandler'], (function(EventHandler) {
 				EventHandler.add('com.woltlab.wcf.redactor2', 'insertAttachment_' + this.$element[0].id, this.WoltLabAttachment._insert.bind(this));
 				EventHandler.add('com.woltlab.wcf.redactor2', 'deleteAttachment_' + this.$element[0].id, this.WoltLabAttachment._delete.bind(this));
diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabDragAndDrop.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabDragAndDrop.js
index 384923ce0a..0410d7da9d 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabDragAndDrop.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabDragAndDrop.js
@@ -3,6 +3,10 @@ $.Redactor.prototype.WoltLabDragAndDrop = function() {
 	
 	return {
 		init: function() {
+			if (!this.opts.woltlab.attachments) {
+				return;
+			}
+			
 			require(['WoltLabSuite/Core/Ui/Redactor/DragAndDrop'], (function (UiRedactorDragAndDrop) {
 				UiRedactorDragAndDrop.init(this);
 			}).bind(this));