Ticket #19845: 19845.8.diff

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

@@ -3507 +3507 @@
 
                         this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
                         this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
+                        this.$document.on( 'click', '.wp-editor-wrap .uploader-editor', _.bind( this.hide, this ) );
 
                         this.initialized = true;
                         return this;
@@ -3520 +3521 @@
                         return supports;
                 },
 
+                isDraggingFile: function( e ) {
+                        if ( _.isUndefined( e.originalEvent ) || _.isUndefined( e.originalEvent.dataTransfer ) ) {
+                                return false;
+                        }
+
+                        return _.indexOf( e.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+                                _.indexOf( e.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+                },
+
                 refresh: function( e ) {
                         var dropzone_id;
+
                         for ( dropzone_id in this.dropzones ) {
                                 // Hide the dropzones only if dragging has left the screen.
                                 this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
@@ -3556 +3567 @@
                         var $wrap = null;
 
                         this.files = event.originalEvent.dataTransfer.files;
-                        if ( this.files.length < 1 )
+
+                        if ( this.files.length < 1 ) {
                                 return;
+                        }
 
                         this.containerDragleave( event );
                         this.dropzoneDragleave( event );
@@ -3593 +3606 @@
                         return this;
                 },
 
-                containerDragover: function() {
+                show: function() {
                         this.overContainer = true;
                         this.refresh();
                 },
 
-                containerDragleave: function() {
+                hide: function() {
                         this.overContainer = false;
+                        this.overDropzone = false;
+                        this.refresh();
+                },
 
+                containerDragover: function( e, show ) {
+                        if ( show === 'show' ) {
+                                this.show();
+                                return;
+                        }
+
+                        if ( ! this.isDraggingFile( e ) ) {
+                                return;
+                        }
+
+                        this.overContainer = true;
+                        this.refresh( e );
+                },
+
+                containerDragleave: function( e ) {
+                        if ( ! this.isDraggingFile( e ) ) {
+                                return;
+                        }
+
+                        this.overContainer = false;
                         // Throttle dragleave because it's called when bouncing from some elements to others.
-                        _.delay( _.bind( this.refresh, this ), 50 );
+                        _.delay( _.bind( this.refresh, this, e ), 50 );
                 },
 
                 dropzoneDragover: function( e ) {
+                        if ( ! this.isDraggingFile( e ) ) {
+                                return;
+                        }
+
                         this.overDropzone = true;
                         this.refresh( e );
                         return false;
@@ -3612 +3652 @@
                 },
 
                 dropzoneDragleave: function( e ) {
+                        if ( ! this.isDraggingFile( e ) ) {
+                                return;
+                        }
+
                         this.overDropzone = false;
                         _.delay( _.bind( this.refresh, this, e ), 50 );
                 }

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

@@ -376 +376 @@
                         });
                 }
 
-                dom.bind( doc, 'dragover', function( event ) {
-                        if ( typeof window.jQuery !== 'undefined' ) {
+                dom.bind( doc, 'dragenter', function( event ) {
+                        if ( typeof window.jQuery !== 'undefined' && event.dataTransfer &&
+                                tinymce.inArray( event.dataTransfer.types, 'Files' ) > -1 && tinymce.inArray( event.dataTransfer.types, 'text/plain' ) === -1 ) {
                                 // Propagate the event to its container for the parent window to catch.
-                                window.jQuery( editor.getContainer() ).trigger( event );
+                                window.jQuery( editor.getContainer() ).trigger( 'dragover', 'show' );
                         }
                 });
         });