Ticket #26041: 26041.patch

src/wp-includes/js/plupload/handlers.js

@@ +1 @@
+/* global plupload:false, pluploadL10n:false, post_id:false, resize_width:false,
+   resize_height:false, shortform:false, ajaxurl:false, wpUploaderInit:false,
+   deleteUserSetting:false, setUserSetting:false, getUserSetting:false
+ */
 var topWin = window.dialogArguments || opener || parent || top, uploader, uploader_init;
 
 function fileDialogStart() {
-        jQuery("#media-upload-error").empty();
+        jQuery('#media-upload-error').empty();
 }
 
 // progress and success handlers for media multi uploads
@@ -49 +53 @@
 
         if ( max > hundredmb && file.size > hundredmb ) {
                 setTimeout(function(){
-                        var done;
-
-                        if ( file.status < 3 && file.loaded == 0 ) { // not uploading
+                        
+                        if ( file.status < 3 && file.loaded === 0 ) { // not uploading
                                 wpFileError(file, pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>'));
                                 up.stop(); // stops the whole queue
                                 up.removeFile(file);
@@ -106 +109 @@
 function setResize(arg) {
         if ( arg ) {
                 if ( uploader.features.jpgresize )
-                        uploader.settings['resize'] = { width: resize_width, height: resize_height, quality: 100 };
+                        uploader.settings.resize = { width: resize_width, height: resize_height, quality: 100 };
                 else
                         uploader.settings.multipart_params.image_resize = true;
         } else {
@@ -129 +132 @@
                 item.append(serverData);
                 prepareMediaItemInit(fileObj);
         } else { // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
-                item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
+                item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm();});
         }
 }
 
@@ -171 +174 @@
                                 action: 'untrash-post',
                                 _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
                         },
-                        success: function(data, textStatus){
+                        success: function( ){
                                 var item = jQuery('#media-item-' + fileObj.id);
-
+                                
                                 if ( type = jQuery('#type-of-' + fileObj.id).val() )
                                         jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1);
 
@@ -210 +213 @@
         if ( last_err == id ) // prevent firing an error for the same file twice
                 return;
 
-        item.html('<div class="error-div">'
-                                + '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>'
-                                + '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> '
-                                + message
-                                + '</div>').data('last-err', id);
+        item.html('<div class="error-div">' +
+                                '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>' +
+                                '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> ' +
+                                message +
+                                '</div>').data('last-err', id);
 }
 
-function deleteSuccess(data, textStatus) {
+function deleteSuccess(data) {
         if ( data == '-1' )
                 return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
 
@@ -480 +483 @@
                         uploadSuccess(file, response.response);
                 });
 
-                uploader.bind('UploadComplete', function(up, files) {
+                uploader.bind('UploadComplete', function() {
                         uploadComplete();
                 });
-        }
+        };
 
-        if ( typeof(wpUploaderInit) == 'object' )
+        if ( typeof(wpUploaderInit) == 'object' ) {
                 uploader_init();
+        }
 
 });