Changeset 28262

Timestamp:

05/06/2014 03:27:02 AM (12 years ago)

Author:

nacin

Message:

Drag/drop on the editor to upload: don't trigger the uploader when selected text is being dragged from one window to another.

Merges [28189] to the 3.9 branch.

props azaozz.
fixes #27880.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/js/media-views.js (modified) (5 diffs)
• src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

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

@@ -3271 +3271 @@
                 overContainer: false,
                 overDropzone: false,
+                draggingFile: null,
 
                 initialize: function() {
@@ -3308 +3309 @@
                         supports = supports && !! ( window.File && window.FileList && window.FileReader );
                         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;
                 },
 
@@ -3319 +3335 @@
                         if ( ! _.isUndefined( e ) ) {
                                 $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
+                        }
+
+                        if ( ! this.overContainer && ! this.overDropzone ) {
+                                this.draggingFile = null;
                         }
 
@@ -3384 +3404 @@
                 },
 
-                containerDragover: function() {
-                        if ( this.localDrag ) {
+                containerDragover: function( event ) {
+                        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
                                 return;
                         }
@@ -3400 +3420 @@
                 },
 
-                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;
                 },

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

@@ -318 +318 @@
                                 if ( typeof window.jQuery !== 'undefined' ) {
                                         // Trigger the jQuery handlers.
-                                        window.jQuery( document ).triggerHandler( event.type );
+                                        window.jQuery( document ).trigger( new window.jQuery.Event( event ) );
                                 }
                         });