sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media: properly refresh the position of the Plupload shim so it moves over the Select Files button or off the screen. Fixes selecting files in MS Edge on the Media grid and Media -> Add New screens. 

Fixes #37039.

git-svn-id: https://develop.svn.wordpress.org/trunk@37722 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2016-06-16 04:53:42 +00:00
parent e1cfb25e79
commit 70afec2875
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/js/media-grid.js
View File

@ -774,6 +774,10 @@ Manage = MediaFrame.extend({
addNewClickHandler: function( event ) { addNewClickHandler: function( event ) {
event.preventDefault(); event.preventDefault();
this.trigger( 'toggle:upload:attachment' ); this.trigger( 'toggle:upload:attachment' );
if ( this.uploader ) {
this.uploader.refresh();
}
}, },
/** /**

4
src/wp-includes/js/media/views/frame/manage.js
View File

@ -189,6 +189,10 @@ Manage = MediaFrame.extend({
addNewClickHandler: function( event ) { addNewClickHandler: function( event ) {
event.preventDefault(); event.preventDefault();
this.trigger( 'toggle:upload:attachment' ); this.trigger( 'toggle:upload:attachment' );
if ( this.uploader ) {
this.uploader.refresh();
}
}, },
/** /**

10
src/wp-includes/js/plupload/handlers.js
View File

@ -430,14 +430,14 @@ jQuery(document).ready(function($){
if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) { if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) {
uploaddiv.addClass('drag-drop'); uploaddiv.addClass('drag-drop');
$('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :( $('#drag-drop-area').on('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
uploaddiv.addClass('drag-over'); uploaddiv.addClass('drag-over');
}).bind('dragleave.wp-uploader, drop.wp-uploader', function(){ }).on('dragleave.wp-uploader, drop.wp-uploader', function(){
uploaddiv.removeClass('drag-over'); uploaddiv.removeClass('drag-over');
}); });
} else { } else {
uploaddiv.removeClass('drag-drop'); uploaddiv.removeClass('drag-drop');
$('#drag-drop-area').unbind('.wp-uploader'); $('#drag-drop-area').off('.wp-uploader');
} }
if ( up.runtime === 'html4' ) { if ( up.runtime === 'html4' ) {
@ -445,6 +445,10 @@ jQuery(document).ready(function($){
} }
}); });
uploader.bind( 'postinit', function( up ) {
up.refresh();
});
uploader.init(); uploader.init();
uploader.bind('FilesAdded', function( up, files ) { uploader.bind('FilesAdded', function( up, files ) {

8
src/wp-includes/js/plupload/wp-plupload.js
View File

@ -180,6 +180,11 @@ window.wp = window.wp || {};
$(self).trigger( 'uploader:ready' ); $(self).trigger( 'uploader:ready' );
}); });
this.uploader.bind( 'postinit', function( up ) {
up.refresh();
self.init();
});
this.uploader.init(); this.uploader.init();
if ( this.browser ) { if ( this.browser ) {
@ -311,9 +316,6 @@ window.wp = window.wp || {};
up.refresh(); up.refresh();
}); });
this.uploader.bind( 'PostInit', function() {
self.init();
});
}; };
// Adds the 'defaults' and 'browser' properties. // Adds the 'defaults' and 'browser' properties.