Changeset 27901

Timestamp:

04/02/2014 02:41:24 AM (11 years ago)

Author:

azaozz

Message:

Drag and drop files on the editor to upload: add new argument to wp_editor() to enable, fixes #27465

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (5 diffs)
• wp-includes/js/media-views.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -480 +480 @@
 <?php wp_editor( $post->post_content, 'content', array(
     'dfw' => true,
+    'drag_drop_upload' => true,
     'tabfocus_elements' => 'insert-media-button,save-post',
     'editor_height' => 360,

trunk/src/wp-includes/class-wp-editor.php

@@ -25 +25 @@
     private static $has_medialib = false;
     private static $editor_buttons_css = true;
+    private static $drag_drop_upload = false;
 
     private function __construct() {}
@@ -39 +40 @@
      *     @type string     $default_editor    When both TinyMCE and Quicktags are used, set which
      *                                         editor is shown on page load. Default empty.
+     *     @type bool       $drag_drop_upload  Whether to enable drag & drop on the editor uploading. Default false.
+     *                                         Requires the media modal.
      *     @type string     $textarea_name     Give the textarea a unique name here. Square brackets
      *                                         can be used here. Default $editor_id.
@@ -64 +67 @@
             'media_buttons'     => true,
             'default_editor'    => '',
+            'drag_drop_upload'  => false,
             'textarea_name'     => $editor_id,
             'textarea_rows'     => 20,
@@ -124 +128 @@
         $switch_class = 'html-active';
         $toolbar = $buttons = $autocomplete = '';
+
+        if ( $set['drag_drop_upload'] ) {
+            self::$drag_drop_upload = true;
+        }
 
         if ( ! empty( $set['editor_height'] ) )
@@ -981 +989 @@
             baseURL: "<?php echo self::$baseurl; ?>",
             suffix: "<?php echo $suffix; ?>",
+            <?php
+
+            if ( self::$drag_drop_upload ) {
+                echo 'dragDropUpload: true,';
+            }
+
+            ?>
             mceInit: <?php echo $mceInit; ?>,
             qtInit: <?php echo $qtInit; ?>,

trunk/src/wp-includes/js/media-views.js

@@ -3132 +3132 @@
             this.initialized = false;
 
-            // Bail if UA does not support drag'n'drop or File API.
-            if ( ! this.browserSupport() ) {
+            // Bail if not enabled or UA does not support drag'n'drop or File API.
+            if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
                 return this;
             }

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -312 +312 @@
         }
 
-        dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
-            if ( typeof window.jQuery !== 'undefined' ) {
-                // Trigger the jQuery handlers.
-                window.jQuery( document ).triggerHandler( event.type );
-            }
-        });
+        if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) {
+            dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
+                if ( typeof window.jQuery !== 'undefined' ) {
+                    // Trigger the jQuery handlers.
+                    window.jQuery( document ).triggerHandler( event.type );
+                }
+            });
+        }
     });