Changeset 22552

Timestamp:

11/12/2012 11:52:17 PM (14 years ago)

Author:

koopersmith

Message:

Media: Add an "upload more files" button to upload states. see #21390.

Location:

trunk/wp-includes

Files:

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

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

@@ -620 +620 @@
 }
 
+
+.attachments-browser .media-toolbar-primary > .media-button,
+.attachments-browser .media-toolbar-primary > .media-button-group,
+.attachments-browser .media-toolbar-secondary > .media-button,
+.attachments-browser .media-toolbar-secondary > .media-button-group {
+        margin-top: 10px;
+}
+
 .attachments-browser .attachments {
         position: absolute;

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

@@ -471 +471 @@
         media.controller.Upload = media.controller.Library.extend({
                 defaults: _.defaults({
-                        id: 'upload'
+                        id:     'upload',
+                        upload: { text: l10n.uploadMoreFiles },
+                        searchable: false
                 }, media.controller.Library.prototype.defaults ),
 
@@ -853 +855 @@
                                 sortable:   state.get('sortable'),
                                 search:     state.get('searchable'),
+                                upload:     state.get('upload'),
 
                                 AttachmentView: state.get('AttachmentView')
@@ -1527 +1530 @@
 
                         $placeholder = this.$('.browser');
-                        $browser.text( $placeholder.text() );
+                        $browser.detach().text( $placeholder.text() );
                         $browser[0].className = $placeholder[0].className;
                         $placeholder.replaceWith( $browser.show() );
@@ -2506 +2509 @@
                         }
 
+                        if ( this.options.upload && this.controller.uploader ) {
+                                this.toolbar.set( 'upload', new media.view.Button( _.extend({
+                                        el:       this.controller.uploader.$browser.detach()[0],
+                                        priority: -60,
+                                        size:     'large',
+                                        text:     l10n.selectFiles
+                                }, this.options.upload ) ).render() );
+                        }
+
                         this.attachments = new media.view.Attachments({
                                 controller: this.controller,

trunk/wp-includes/media.php

@@ -1340 +1340 @@
                 'selectFiles'       => __( 'Select files' ),
                 'uploadImagesTitle' => __( 'Upload Images' ),
+                'uploadMoreFiles'   => __( 'Upload more files' ),
 
                 // Library