Changeset 22781

Timestamp:

11/21/2012 06:29:53 PM (12 years ago)

Author:

koopersmith

Message:

Media: Make the upload state a dedicated screen, instead of including its own library view. see #21390.

File:

• trunk/wp-includes/js/media-views.js (modified) (6 diffs)

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

@@ -445 +445 @@
     // wp.media.controller.Upload
     // ---------------------------
-    media.controller.Upload = media.controller.Library.extend({
+    media.controller.Upload = media.controller.State.extend({
         defaults: _.defaults({
-            id:         'upload',
-            upload:     { text: l10n.uploadMoreFiles },
-            searchable: false,
-            sortable:   true
-        }, media.controller.Library.prototype.defaults ),
+            id:      'upload',
+            content: 'upload',
+            sidebar: 'empty',
+            toolbar: 'empty',
+
+            // The state to navigate to when files are uploading.
+            libraryState: 'library'
+        }, media.controller.State.prototype.defaults ),
 
         initialize: function() {
-            var library = this.get('library');
-
-            // If a `library` attribute isn't provided, create a new
-            // `Attachments` collection that observes (and thereby receives
-            // all uploading) attachments.
-            if ( ! library ) {
-                library = new Attachments();
-                library.observe( wp.Uploader.queue );
-                this.set( 'library', library );
-            }
-
-            media.controller.Library.prototype.initialize.apply( this, arguments );
-        }
-
+            media.controller.State.prototype.initialize.apply( this, arguments );
+        },
+
+        activate: function() {
+            wp.Uploader.queue.on( 'add', this.uploading, this );
+            media.controller.State.prototype.activate.apply( this, arguments );
+        },
+
+        deactivate: function() {
+            wp.Uploader.queue.off( null, null, this );
+            media.controller.State.prototype.deactivate.apply( this, arguments );
+        },
+
+        uploading: function( attachment ) {
+            var library = this.get('libraryState');
+
+            this.frame.get( library ).get('selection').add( attachment );
+            this.frame.state( library );
+        }
     });
 
@@ -1176 +1184 @@
 
         createStates: function() {
-            var options = this.options,
-                attributes;
-
-            attributes = {
-                multiple: this.options.multiple,
-                menu:     'main',
-                toolbar:  'select'
-            };
+            var options = this.options;
 
             // Add the default states.
@@ -1190 +1191 @@
                 new media.controller.Library( _.defaults({
                     selection: options.selection,
-                    library:   media.query( options.library )
+                    library:   media.query( options.library ),
+                    multiple:  this.options.multiple,
+                    menu:      'main',
+                    toolbar:   'select'
                 }, attributes ) ),
 
-                new media.controller.Upload( attributes )
+                new media.controller.Upload({
+                    menu: 'main'
+                })
             ]);
         },
@@ -1246 +1252 @@
 
         uploadContent: function() {
-            // In the meantime, render an inline uploader.
+            this.$el.addClass('hide-sidebar hide-toolbar');
+
             this.content.view( new media.view.UploaderInline({
                 controller: this
@@ -1343 +1350 @@
 
         createStates: function() {
-            var options = this.options,
-                main, gallery;
-
-            main = {
-                multiple: this.options.multiple,
-                menu:      'main',
-                sidebar:   'attachment-settings',
-
-                // Update user settings when users adjust the
-                // attachment display settings.
-                displayUserSettings: true
-            };
-
-            gallery = {
-                multiple:     true,
-                menu:         'gallery',
-                toolbar:      'gallery-add',
-                excludeState: 'gallery-edit'
-            };
+            var options = this.options;
 
             // Add the default states.
             this.states.add([
                 // Main states.
-                new media.controller.Library( _.defaults({
+                new media.controller.Library({
                     selection:  options.selection,
                     library:    media.query( options.library ),
                     editable:   true,
-                    filterable: 'all'
-                }, main ) ),
-
-                new media.controller.Upload( main ),
+                    filterable: 'all',
+                    multiple:   this.options.multiple,
+                    menu:       'main',
+                    sidebar:    'attachment-settings',
+
+                    // Update user settings when users adjust the
+                    // attachment display settings.
+                    displayUserSettings: true
+                }),
+
+                new media.controller.Upload({
+                    menu: 'main'
+                }),
 
                 // Embed states.
@@ -1385 +1383 @@
                 }),
 
-                new media.controller.Library( _.defaults({
-                    id:         'gallery-library',
-                    library:    media.query({ type: 'image' }),
-                    filterable: 'uploaded'
-                }, gallery ) ),
-
-                new media.controller.Upload( _.defaults({
-                    id: 'gallery-upload'
-                }, gallery ) )
+                new media.controller.Library({
+                    id:           'gallery-library',
+                    library:      media.query({ type: 'image' }),
+                    filterable:   'uploaded',
+                    multiple:     true,
+                    menu:         'gallery',
+                    toolbar:      'gallery-add',
+                    excludeState: 'gallery-edit'
+                }),
+
+                new media.controller.Upload({
+                    id:           'gallery-upload',
+                    menu:         'gallery',
+                    libraryState: 'gallery-edit'
+                })
             ]);
         },