Changeset 22825

Timestamp:

11/22/2012 12:54:49 PM (14 years ago)

Author:

koopersmith

Message:

Media: Use a full uploader status view in the inline uploader. see #21390.

Location:

trunk/wp-includes

Files:

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

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

@@ -758 +758 @@
         position: relative;
         padding-bottom: 10px;
+}
+
+.media-sidebar .media-uploader-status {
         border-bottom: 1px solid #dfdfdf;
         box-shadow: 0 1px 0 #fff;
+}
+
+.uploader-inline .media-uploader-status h3 {
+        display: none;
 }
 
@@ -792 +799 @@
 
 .media-uploader-status .upload-dismiss-errors {
-        position: absolute;
-        top: 0;
-        right: 0;
         text-decoration: none;
+}
+
+.media-sidebar .media-uploader-status .upload-dismiss-errors {
+        position: absolute;
+        top: 0;
+        right: 0;
 }
 
@@ -812 +822 @@
         font-weight: bold;
         color: #fff;
-        background: #f00;
-        background: -webkit-linear-gradient( top, #e00, #a00 );
+        background: #e00;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#e00), to(#a00));
+        background-image: -webkit-linear-gradient(top, #e00, #a00);
+        background-image:    -moz-linear-gradient(top, #e00, #a00);
+        background-image:      -o-linear-gradient(top, #e00, #a00);
+        background-image:   linear-gradient(to bottom, #e00, #a00);
         border-radius: 3px;
 }

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

@@ -1794 +1794 @@
                                 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')
+                        this.views.set( '.upload-inline-status', new media.view.UploaderStatus({
+                                controller: this.controller
                         }) );
                 },
@@ -1845 +1834 @@
 
                         this.errors = wp.Uploader.errors;
+                        this.errors.reset();
                         this.errors.on( 'add remove reset', this.visibility, this );
                         this.errors.on( 'add', this.error, this );
-                        _.each( this.errors.models, this.error, this );
                 },
 

trunk/wp-includes/media.php

@@ -1498 +1498 @@
                         </div>
 
-                        <div class="upload-errors"></div>
+                        <div class="upload-inline-status"></div>
 
                         <div class="post-upload-ui">