Changeset 22658

Timestamp:

11/19/2012 03:11:48 AM (12 years ago)

Author:

koopersmith

Message:

Media: Remove unused batch edit states and strings. see #21390.

Location:

trunk/wp-includes

Files:

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

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

@@ -1092 +1092 @@
         createStates: function() {
             var options = this.options,
-                main, gallery, batch;
+                main, gallery;
 
             main = {
@@ -1109 +1109 @@
                 toolbar:      'gallery-add',
                 excludeState: 'gallery-edit'
-            };
-
-            batch = {
-                multiple:     true,
-                menu:         'batch',
-                toolbar:      'batch-add',
-                excludeState: 'batch-edit'
             };
 
@@ -1146 +1139 @@
                 new media.controller.Upload( _.defaults({
                     id: 'gallery-upload'
-                }, gallery ) ),
-
-                // Batch states.
-                new media.controller.Library({
-                    id:         'batch-edit',
-                    multiple:   false,
-                    describe:   true,
-                    edge:       199,
-                    sortable:   true,
-                    searchable: false,
-                    menu:       'batch',
-                    toolbar:    'batch-edit',
-                    sidebar:    'attachment-settings'
-                }),
-
-                new media.controller.Library( _.defaults({
-                    id:      'batch-library',
-                    library: media.query({ type: 'image' })
-                }, batch ) ),
-
-                new media.controller.Upload( _.defaults({
-                    id: 'batch-upload'
-                }, batch ) )
+                }, gallery ) )
             ]);
         },
@@ -1177 +1148 @@
             var handlers = {
                     menu: {
-                        'batch':   'batchMenu',
                         'gallery': 'galleryMenu'
                     },
@@ -1193 +1163 @@
                         'main-attachments': 'mainAttachmentsToolbar',
                         'main-embed':       'mainEmbedToolbar',
-                        'batch-edit':       'batchEditToolbar',
-                        'batch-add':        'batchAddToolbar',
                         'gallery-edit':     'galleryEditToolbar',
                         'gallery-add':      'galleryAddToolbar'
@@ -1223 +1191 @@
                 }
             });
-        },
-
-        batchMenu: function() {
-            var previous = this.previous(),
-                frame = this;
-
-            this.menu.view( new media.view.Menu({
-                controller: this,
-                views: {
-                    cancel: {
-                        text:     l10n.cancelBatchTitle,
-                        priority: 20,
-                        click:    function() {
-                            if ( previous )
-                                frame.state( previous );
-                            else
-                                frame.close();
-                        }
-                    },
-                    separateCancel: new media.View({
-                        className: 'separator',
-                        priority: 40
-                    }),
-                    'batch-edit': {
-                        text: l10n.editBatchTitle,
-                        priority: 60
-                    },
-                    'batch-upload': {
-                        text: l10n.uploadFilesTitle,
-                        priority: 80
-                    },
-                    'batch-library': {
-                        text: l10n.mediaLibraryTitle,
-                        priority: 100
-                    }
-                }
-            }) );
         },
 
@@ -1398 +1329 @@
         },
 
-        batchEditToolbar: function() {
-            this.toolbar.view( new media.view.Toolbar({
-                controller: this,
-                items: {
-                    insert: {
-                        style:    'primary',
-                        text:     l10n.insertIntoPost,
-                        priority: 80,
-
-                        click: function() {
-                            var controller = this.controller,
-                                state = controller.state();
-
-                            controller.close();
-                            state.trigger( 'insert', state.get('library') );
-
-                            controller.reset();
-                            // @todo: Make the state activated dynamic (instead of hardcoded).
-                            controller.state('upload');
-                        }
-                    }
-                }
-            }) );
-        },
-
-        batchAddToolbar: function() {
-            this.toolbar.view( new media.view.Toolbar({
-                controller: this,
-                items: {
-                    insert: {
-                        style:    'primary',
-                        text:     l10n.addToBatch,
-                        priority: 80,
-
-                        click: function() {
-                            var controller = this.controller,
-                                state = controller.state(),
-                                edit = controller.get('batch-edit');
-
-                            edit.get('library').add( state.get('selection').models );
-                            state.trigger('reset');
-                            controller.state('batch-edit');
-                        }
-                    }
-                }
-            }) );
-        },
-
         galleryEditToolbar: function() {
             var editing = this.state().get('editing');

trunk/wp-includes/media.php

@@ -1362 +1362 @@
         'insertEmbed'       => __( 'Insert embed' ),
 
-        // Batch
-        'batchInsert'      => __( 'Batch insert' ),
-        'cancelBatchTitle' => __( '← Cancel Batch' ),
-        'editBatchTitle'   => __( 'Edit Batch' ),
-        'addToBatch'       => __( 'Add to batch' ),
-
         // Gallery
         'createGalleryTitle' => __( 'Create Gallery' ),