Wordpress 4.6-scripts

[autoinstalls/wordpress.git] / wp-includes / js / plupload / handlers.js

diff --git a/wp-includes/js/plupload/handlers.js b/wp-includes/js/plupload/handlers.js
index 1396a2d3be77183ace657818af291f27c5356e82..7f3a8c246916a2c01d04c2e8d63850394ebce610 100644 (file)
--- a/wp-includes/js/plupload/handlers.js
+++ b/wp-includes/js/plupload/handlers.js
@@ -285,7 +285,7 @@ function uploadError(fileObj, errorCode, message, uploader) {
                        wpFileError(fileObj, pluploadL10n.upload_failed);
                        break;
                case plupload.FILE_EXTENSION_ERROR:
-                       wpFileError(fileObj, pluploadL10n.invalid_filetype);
+                       wpFileExtensionError( uploader, fileObj, pluploadL10n.invalid_filetype );
                        break;
                case plupload.FILE_SIZE_ERROR:
                        uploadSizeError(uploader, fileObj);
@@ -340,6 +340,11 @@ function uploadSizeError( up, file, over100mb ) {
        up.removeFile(file);
 }
 
+function wpFileExtensionError( up, file, message ) {
+       jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
+       up.removeFile(file);
+}
+
 jQuery(document).ready(function($){
        $('.media-upload-form').bind('click.uploader', function(e) {
                var target = $(e.target), tr, c;
@@ -430,14 +435,14 @@ jQuery(document).ready(function($){
 
                        if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) {
                                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');
-                               }).bind('dragleave.wp-uploader, drop.wp-uploader', function(){
+                               }).on('dragleave.wp-uploader, drop.wp-uploader', function(){
                                        uploaddiv.removeClass('drag-over');
                                });
                        } else {
                                uploaddiv.removeClass('drag-drop');
-                               $('#drag-drop-area').unbind('.wp-uploader');
+                               $('#drag-drop-area').off('.wp-uploader');
                        }
 
                        if ( up.runtime === 'html4' ) {
@@ -445,6 +450,10 @@ jQuery(document).ready(function($){
                        }
                });
 
+               uploader.bind( 'postinit', function( up ) {
+                       up.refresh();
+               });
+
                uploader.init();
 
                uploader.bind('FilesAdded', function( up, files ) {