Changeset 22583

Timestamp:

11/14/2012 10:40:34 PM (12 years ago)

Author:

koopersmith

Message:

Media: Unify the "Insert" and "Insert.Post" toolbars. see #21390.

File:

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

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

@@ -1249 +1249 @@
         // Toolbars
         mainAttachmentsToolbar: function() {
-            this.toolbar.view( new media.view.Toolbar.Insert.Post({
+            this.toolbar.view( new media.view.Toolbar.Insert({
                 controller: this
             }) );
@@ -1739 +1739 @@
         initialize: function() {
             var controller = this.options.controller,
-                selection = controller.state().get('selection');
+                selection = controller.state().get('selection'),
+                selectionToLibrary;
+
+            selectionToLibrary = function( state, filter ) {
+                return function() {
+                    var controller = this.controller,
+                        selection = controller.state().get('selection'),
+                        edit = controller.get( state ),
+                        models = filter ? filter( selection ) : selection.models;
+
+                    edit.set( 'library', new media.model.Selection( models, {
+                        props:    selection.props.toJSON(),
+                        multiple: true
+                    }) );
+
+                    this.controller.state( state );
+                };
+            };
 
             this.options.items = _.defaults( this.options.items || {}, {
@@ -1758 +1775 @@
                         selection.clear();
                     }
-                }
-            });
-
-            media.view.Toolbar.prototype.initialize.apply( this, arguments );
-        },
-
-        refresh: function() {
-            var selection = this.controller.state().get('selection');
-            this.get('insert').model.set( 'disabled', ! selection.length );
-        }
-    });
-
-    // wp.media.view.Toolbar.Insert.Post
-    // ---------------------------------
-    media.view.Toolbar.Insert.Post = media.view.Toolbar.Insert.extend({
-        initialize: function() {
-            var selectionToLibrary = function( state, filter ) {
-                    return function() {
-                        var controller = this.controller,
-                            selection = controller.state().get('selection'),
-                            edit = controller.get( state ),
-                            models = filter ? filter( selection ) : selection.models;
-
-                        edit.set( 'library', new media.model.Selection( models, {
-                            props:    selection.props.toJSON(),
-                            multiple: true
-                        }) );
-
-                        this.controller.state( state );
-                    };
-                };
-
-            this.options.items = _.defaults( this.options.items || {}, {
+                },
+
                 gallery: {
                     text:     l10n.createNewGallery,
@@ -1806 +1792 @@
             });
 
-            media.view.Toolbar.Insert.prototype.initialize.apply( this, arguments );
+            media.view.Toolbar.prototype.initialize.apply( this, arguments );
         },
 
@@ -1813 +1799 @@
                 count = selection.length;
 
-            // Call the parent's `refresh()` method.
-            media.view.Toolbar.Insert.prototype.refresh.apply( this, arguments );
+            this.get('insert').model.set( 'disabled', ! selection.length );
 
             // Check if every attachment in the selection is an image.