Changeset 29415

Timestamp:

08/06/2014 07:12:41 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: display upload errors in a dismissable sidebar.

See #29037.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -256 +256 @@
     overflow: auto;
     -webkit-overflow-scrolling: touch;
+}
+
+.upload-php .mode-grid .hide-sidebar .media-sidebar {
+    top: 102px;
+    display: none;
 }
 
@@ -1384 +1389 @@
     margin: 0;
     -webkit-box-shadow: none;
-    box-shadow: none; 
+    box-shadow: none;
 }
 

trunk/src/wp-includes/js/media-grid.js

@@ -192 +192 @@
 
             // Browse our library of attachments.
-            contentRegion.view = new media.view.AttachmentsBrowser({
+            this.browserView = contentRegion.view = new media.view.AttachmentsBrowser({
                 controller: this,
                 collection: state.get('library'),
@@ -202 +202 @@
                 display:    state.get('displaySettings'),
                 dragInfo:   state.get('dragInfo'),
-                sidebar:    false,
+                sidebar:    'errors',
 
                 suggestedWidth:  state.get('suggestedWidth'),
@@ -211 +211 @@
                 scrollElement: document
             });
+
+            this.errors = wp.Uploader.errors;
+            this.errors.on( 'add remove reset', this.sidebarVisibility, this );
+        },
+
+        sidebarVisibility: function() {
+            this.browserView.$( '.media-sidebar' ).toggle( this.errors.length );
         }
     });

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

@@ -5703 +5703 @@
             if ( this.options.sidebar ) {
                 this.createSidebar();
-            } else {
+            }
+
+            if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
                 this.$el.addClass( 'hide-sidebar' );
             }