Improve clipboard pseudo-pages for media management

diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml
index d633a98d87c1255f727c40690abaa73de0fe8a3e..cbe7ec5302b164836ebff29b7f62d5b4df15c132 100644 (file)
--- 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 08473214ad1d4275bb90b8cf5bd51cd5b61e4ae2..3a55f4ecbd46a2ec91eb8b12fc8c6849ed40921b 100644 (file)
--- 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));