Changeset 22597

Timestamp:

11/15/2012 03:09:35 AM (14 years ago)

Author:

koopersmith

Message:

Media: Only show the edit selection link for the media library. Make the upload attachments list sortable. Only retain the silent option when running Attachments.validate(). see #21390.

Location:

trunk/wp-includes/js

Files:

• media-models.js (modified) (1 diff)
• media-views.js (modified) (5 diffs)

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

@@ -359 +359 @@
 
                 validate: function( attachment, options ) {
+                        // Only retain the `silent` option.
+                        options = {
+                                silent: options && options.silent
+                        };
+
                         return this[ this.validator( attachment ) ? 'add' : 'remove' ]( attachment, options );
                 },

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

@@ -459 +459 @@
         media.controller.Upload = media.controller.Library.extend({
                 defaults: _.defaults({
-                        id:     'upload',
-                        upload: { text: l10n.uploadMoreFiles },
-                        searchable: false
+                        id:         'upload',
+                        upload:     { text: l10n.uploadMoreFiles },
+                        searchable: false,
+                        sortable:   true
                 }, media.controller.Library.prototype.defaults ),
 
@@ -472 +473 @@
                         if ( ! library ) {
                                 library = new Attachments();
-                                library.props.set({
-                                        orderby: 'date',
-                                        order:   'ASC'
-                                });
                                 library.observe( wp.Uploader.queue );
                                 this.set( 'library', library );
@@ -996 +993 @@
                                 new media.controller.Library( _.defaults({
                                         selection: options.selection,
-                                        library:   media.query( options.library )
+                                        library:   media.query( options.library ),
+                                        editable:  true
                                 }, main ) ),
 
@@ -1257 +1255 @@
                 mainAttachmentsToolbar: function() {
                         this.toolbar.view( new media.view.Toolbar.Insert({
-                                controller: this
+                                controller: this,
+                                editable:   this.state().get('editable')
                         }) );
                 },
@@ -1771 +1770 @@
                                         priority:   -40,
 
-                                        editable: function() {
+                                        // If the selection is editable, pass the callback to
+                                        // switch the content mode.
+                                        editable: this.options.editable && function() {
                                                 this.controller.content.mode('edit-selection');
                                         }