From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 25 Dec 2015 07:25:09 +0000 (+0100)
Subject: Improve clipboard pseudo-pages for media management
X-Git-Tag: 3.0.0_Beta_1~2030^2~201
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a496b4dba3f45e7b3b23d85f8f2ccf64243a3cec;p=GitHub%2FWoltLab%2FWCF.git

Improve clipboard pseudo-pages for media management
---

diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml
index d633a98d87..cbe7ec5302 100644
--- a/com.woltlab.wcf/clipboardAction.xml
+++ b/com.woltlab.wcf/clipboardAction.xml
@@ -91,16 +91,17 @@
 			<pages>
 				<!--
 				the clipboard API requires a page but since the media clipboard can be used
-				in dialogs, we use this wildcard instead of a real page class
+				in dialogs, we use pseudo-pages
 				-->
-				<page><![CDATA[*]]></page>
+				<page><![CDATA[menuManagerDialog-editor]]></page>
 			</pages>
 		</action>
 		<action name="delete">
 			<actionclassname><![CDATA[wcf\system\clipboard\action\MediaClipboardAction]]></actionclassname>
 			<showorder>2</showorder>
 			<pages>
-				<page><![CDATA[*]]></page>
+				<page><![CDATA[menuManagerDialog-editor]]></page>
+				<page><![CDATA[menuManagerDialog-select]]></page>
 			</pages>
 		</action>
 		<!-- /com.woltlab.wcf.media -->
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js
index 08473214ad..3a55f4ecbd 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js
@@ -198,7 +198,7 @@ define(
 				
 				Clipboard.setup({
 					hasMarkedItems: data.returnValues.hasMarkedItems ? true : false,
-					pageClassName: '*'
+					pageClassName: 'menuManagerDialog-' + this.getMode()
 				});
 				
 				EventHandler.add('com.woltlab.wcf.clipboard', 'com.woltlab.wcf.media', this._clipboardAction.bind(this));