Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/js/media/controllers/audio-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ AudioDetails = State.extend(/** @lends wp.media.controller.AudioDetails.prototyp
content: 'audio-details',
menu: 'audio-details',
router: false,
uploader: false,
priority: 60
},

Expand Down
1 change: 1 addition & 0 deletions src/js/media/controllers/cropper.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Cropper = wp.media.controller.State.extend(/** @lends wp.media.controller.Croppe
toolbar: 'crop',
content: 'crop',
router: false,
uploader: false,
canSkipCrop: false,

// Default doCrop Ajax arguments to allow the Customizer (for example) to inject state.
Expand Down
3 changes: 2 additions & 1 deletion src/js/media/controllers/edit-image.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ EditImage = wp.media.controller.State.extend(/** @lends wp.media.controller.Edit
menu: false,
toolbar: 'edit-image',
content: 'edit-image',
url: ''
url: '',
uploader: false
},

/**
Expand Down
1 change: 1 addition & 0 deletions src/js/media/controllers/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Embed = wp.media.controller.State.extend(/** @lends wp.media.controller.Embed.pr
menu: 'default',
toolbar: 'main-embed',
priority: 120,
uploader: false,
type: 'link',
url: '',
metadata: {}
Expand Down
1 change: 1 addition & 0 deletions src/js/media/controllers/image-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ImageDetails = State.extend(/** @lends wp.media.controller.ImageDetails.prototyp
router: false,
toolbar: 'image-details',
editing: false,
uploader: false,
priority: 60
}, Library.prototype.defaults ),

Expand Down
1 change: 1 addition & 0 deletions src/js/media/controllers/video-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ VideoDetails = State.extend(/** @lends wp.media.controller.VideoDetails.prototyp
content: 'video-details',
menu: 'video-details',
router: false,
uploader: false,
priority: 60
},

Expand Down
39 changes: 38 additions & 1 deletion src/js/media/views/uploader/window.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ UploaderWindow = wp.media.View.extend(/** @lends wp.media.view.UploaderWindow.pr

ready: function() {
var postId = wp.media.view.settings.post.id,
dropzone;
dropzone, blockDrop;

// If the uploader already exists, bail.
if ( this.uploader ) {
Expand All @@ -71,9 +71,46 @@ UploaderWindow = wp.media.View.extend(/** @lends wp.media.view.UploaderWindow.pr
dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );

// Ignore files dragged onto states that don't support uploading, e.g. cropping.
// Listen in the capture phase to run before the uploader's own drag and drop handlers.
blockDrop = _.bind( this.blockDrop, this );
dropzone.each( function() {
var element = this;

_.each( [ 'dragenter', 'dragover', 'drop' ], function( type ) {
element.addEventListener( type, blockDrop, true );
} );
} );

$( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
},

/**
* Prevents dropping files when the current state doesn't support uploading.
*
* States opt out of uploading by setting their `uploader` attribute to false.
*
* @since 7.2.0
*
* @param {DragEvent} event The drag event.
*/
blockDrop: function( event ) {
var state = this.controller.state();

if ( ! state || false !== state.get( 'uploader' ) ) {
return;
}

// Only block files; other content, such as text, can still be dragged.
if ( ! event.dataTransfer || -1 === _.indexOf( event.dataTransfer.types, 'Files' ) ) {
return;
}

event.stopPropagation();
event.preventDefault();
event.dataTransfer.dropEffect = 'none';
},

_ready: function() {
this.controller.trigger( 'uploader:ready' );
},
Expand Down
Loading