Ticket #27880: 27880.2.diff

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

@@ -3270 +3270 @@
                 localDrag: false,
                 overContainer: false,
                 overDropzone: false,
+                draggingFile: null,
 
                 initialize: function() {
                         var self = this;
@@ -3309 +3310 @@
                         return supports;
                 },
 
+                isDraggingFile: function( event ) {
+                        if ( this.draggingFile !== null ) {
+                                return this.draggingFile;
+                        }
+
+                        if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
+                                return false;
+                        }
+
+                        this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+                                _.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+
+                        return this.draggingFile;
+                },
+
                 refresh: function( e ) {
                         var dropzone_id;
                         for ( dropzone_id in this.dropzones ) {
@@ -3320 +3336 @@
                                 $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
                         }
 
+                        if ( ! this.overContainer && ! this.overDropzone ) {
+                                this.draggingFile = null;
+                        }
+
                         return this;
                 },
 
@@ -3383 +3403 @@
                         return this;
                 },
 
-                containerDragover: function() {
-                        if ( this.localDrag ) {
+                containerDragover: function( event ) {
+                        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
                                 return;
                         }
 
@@ -3399 +3419 @@
                         _.delay( _.bind( this.refresh, this ), 50 );
                 },
 
-                dropzoneDragover: function( e ) {
-                        if ( this.localDrag ) {
+                dropzoneDragover: function( event ) {
+                        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
                                 return;
                         }
 
                         this.overDropzone = true;
-                        this.refresh( e );
+                        this.refresh( event );
                         return false;
                 },
 

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

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