Changeset 22789

Timestamp:

11/21/2012 08:17:25 PM (14 years ago)

Author:

koopersmith

Message:

Uploader: Route plupload errors to the correct handler and prevent naming conflicts. see #21390.

File:

• trunk/wp-includes/js/plupload/wp-plupload.js (modified) (3 diffs)

trunk/wp-includes/js/plupload/wp-plupload.js

@@ -212 +212 @@
                 });
 
-                this.uploader.bind( 'Error', function( up, error ) {
+                this.uploader.bind( 'Error', function( up, pluploadError ) {
                         var message = pluploadL10n.default_error,
                                 key;
@@ -218 +218 @@
                         // Check for plupload errors.
                         for ( key in Uploader.errorMap ) {
-                                if ( error.code === plupload[ key ] ) {
+                                if ( pluploadError.code === plupload[ key ] ) {
                                         message = Uploader.errorMap[ key ];
                                         break;
@@ -224 +224 @@
                         }
 
-                        self.error( message, error, error.file );
+                        error( message, pluploadError, pluploadError.file );
                         up.refresh();
                 });