Changeset 22824

Timestamp:

11/22/2012 12:35:05 PM (14 years ago)

Author:

koopersmith

Message:

Media: Add uploader error detection to the inline uploader view as well. see #21390.

Location:

trunk/wp-includes

Files:

• css/media-views.css (modified) (3 diffs)
• js/media-views.js (modified) (1 diff)
• media.php (modified) (2 diffs)

trunk/wp-includes/css/media-views.css

@@ -798 +798 @@
 }
 
-.media-uploader-status .upload-error {
-        margin: 8px 0 0 0;
+.upload-errors .upload-error {
+        max-width: 400px;
+        margin: 8px auto 0 auto;
         padding: 8px;
         border: 1px #c00 solid;
@@ -806 +807 @@
 }
 
-.media-uploader-status .upload-error-label {
+.upload-errors .upload-error-label {
         padding: 2px 4px;
         margin-right: 8px;
@@ -816 +817 @@
 }
 
-.media-uploader-status .upload-error-message {
+.upload-errors .upload-error-message {
         display: block;
         padding-top: 8px;

trunk/wp-includes/js/media-views.js

@@ -1793 +1793 @@
                         if ( ! this.options.$browser && this.controller.uploader )
                                 this.options.$browser = this.controller.uploader.$browser;
+
+                        wp.Uploader.errors.on( 'add', this.error, this );
+                },
+
+                dispose: function() {
+                        wp.Uploader.errors.off( null, null, this );
+                        media.View.prototype.dispose.apply( this, arguments );
+                        return this;
+                },
+
+                error: function( error ) {
+                        this.views.set( '.upload-errors', new media.view.UploaderStatusError({
+                                filename: error.get('file').name,
+                                message:  error.get('message')
+                        }) );
                 },
 

trunk/wp-includes/media.php

@@ -1498 +1498 @@
                         </div>
 
+                        <div class="upload-errors"></div>
+
                         <div class="post-upload-ui">
                                 <?php do_action( 'pre-upload-ui' ); ?>
@@ -1546 +1548 @@
                         <span class="upload-filename"></span>
                 </div>
-                <div class="upload-errors">
-                </div>
+                <div class="upload-errors"></div>
         </script>