Changeset 22987

Timestamp:

12/03/2012 05:32:25 AM (13 years ago)

Author:

ryan

Message:

Add random and reverse sorting options to gallery settings.

Props koopersmith
fixes #22637

Location:

trunk/wp-includes

Files:

• css/media-views.css (modified) (1 diff)
• js/media-editor.js (modified) (2 diffs)
• js/media-models.js (modified) (2 diffs)
• js/media-views.js (modified) (15 diffs)
• media.php (modified) (3 diffs)

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

@@ -272 +272 @@
 }
 
+.media-sidebar .setting input[type="checkbox"] {
+    margin-top: 10px;
+}
+
 .media-sidebar .setting span,
 .compat-item label span {

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

@@ -190 +190 @@
                 args.perPage = -1;
 
+                // Mark the `orderby` override attribute.
+                if ( 'rand' === attrs.orderby )
+                    attrs._orderbyRandom = true;
+
                 // Map the `orderby` attribute to the corresponding model property.
                 if ( ! attrs.orderby || /^menu_order(?: ID)?$/i.test( attrs.orderby ) )
@@ -232 +236 @@
                 if ( props.uploadedTo )
                     attrs.id = props.uploadedTo;
+
+                // Check if the gallery is randomly ordered.
+                if ( attrs._orderbyRandom )
+                    attrs.orderby = 'rand';
+                delete attrs._orderbyRandom;
 
                 // If the `ids` attribute is set and `orderby` attribute

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

@@ -833 +833 @@
         // selected attachments, reset the selection.
         add: function( models, options ) {
-            if ( ! this.multiple ) {
-                models = _.isArray( models ) && models.length ? _.first( models ) : models;
-                this.clear( options );
-            }
+            if ( ! this.multiple )
+                this.remove( this.models );
 
             return Attachments.prototype.add.call( this, models, options );
-        },
-
-        // Removes all models from the selection.
-        clear: function( options ) {
-            this.remove( this.models, options ).single();
-            return this;
-        },
-
-        // Override the selection's reset method.
-        // Always direct items through add and remove,
-        // as we need them to fire.
-        reset: function( models, options ) {
-            this.clear( options ).add( models, options ).single();
-            return this;
-        },
-
-        // Create selection.has, which determines if a model
-        // exists in the collection based on cid and id,
-        // instead of direct comparison.
-        has: function( attachment ) {
-            return !! ( this.getByCid( attachment.cid ) || this.get( attachment.id ) );
         },
 
@@ -870 +847 @@
 
             // If the single model isn't in the selection, remove it.
-            if ( this._single && ! this.has( this._single ) )
+            if ( this._single && ! this.getByCid( this._single.cid ) )
                 delete this._single;
 

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

@@ -330 +330 @@
 
         reset: function() {
-            this.get('selection').clear();
+            this.get('selection').reset();
             this.resetDisplays();
         },
@@ -535 +535 @@
 
         gallerySettings: function() {
-            var library = this.get('library');
+            var library = this.get('library'),
+                browser;
 
             if ( ! library )
@@ -542 +543 @@
             library.gallery = library.gallery || new Backbone.Model();
 
-            this.frame.content.view().sidebar.set({
+            browser = this.frame.content.view();
+
+            browser.sidebar.set({
                 gallery: new media.view.Settings.Gallery({
                     controller: this,
@@ -548 +551 @@
                     priority:   40
                 })
+            });
+
+            browser.toolbar.set( 'reverse', {
+                text:     l10n.reverseOrder,
+                priority: 80,
+
+                click: function() {
+                    library.reset( library.toArray().reverse() );
+                }
             });
         }
@@ -2506 +2518 @@
 
         initialize: function() {
+            var selection = this.options.selection;
+
             this.controller = this.options.controller;
 
             this.model.on( 'change:sizes change:uploading change:caption change:title', this.render, this );
             this.model.on( 'change:percent', this.progress, this );
+
+            // Update the selection.
             this.model.on( 'add', this.select, this );
             this.model.on( 'remove', this.deselect, this );
+            if ( selection )
+                selection.on( 'reset', this.updateSelect, this );
 
             // Update the model's details view.
@@ -2519 +2537 @@
 
         dispose: function() {
+            var selection = this.options.selection;
+
+            // Make sure all settings are saved before removing the view.
             this.updateAll();
+
+            if ( selection )
+                selection.off( null, null, this );
+
             media.View.prototype.dispose.apply( this, arguments );
             return this;
@@ -2558 +2583 @@
 
             // Check if the model is selected.
-            if ( this.selected() )
-                this.select();
+            this.updateSelect();
 
             this.views.render();
@@ -2577 +2601 @@
                 return;
 
-            if ( selection.has( model ) ) {
+            if ( this.selected() ) {
                 // If the model is the single model, remove it.
                 // If it is not the same as the single model,
@@ -2587 +2611 @@
         },
 
+        updateSelect: function() {
+            this[ this.selected() ? 'select' : 'deselect' ]();
+        },
+
         selected: function() {
             var selection = this.options.selection;
             if ( selection )
-                return selection.has( this.model );
+                return !! selection.getByCid( this.model.cid );
         },
 
@@ -3313 +3341 @@
         clear: function( event ) {
             event.preventDefault();
-            this.collection.clear();
+            this.collection.reset();
         }
     });
@@ -3389 +3417 @@
         clear: function( event ) {
             event.preventDefault();
-            this.collection.clear();
+            this.collection.reset();
         }
     });
@@ -3469 +3497 @@
                 if ( ! $setting.is(':focus') )
                     $setting.val( value );
+
+            // Handle checkboxes.
+            } else if ( $setting.is('input[type="checkbox"]') ) {
+                $setting.attr( 'checked', !! value );
             }
         },
@@ -3482 +3514 @@
                 return;
 
+            // Use the correct value for checkboxes.
+            if ( $setting.is('input[type="checkbox"]') )
+                value = $setting[0].checked;
+
+            // Update the corresponding setting.
             this.model.set( $setting.data('setting'), value );
 
@@ -3551 +3588 @@
             $input.show();
 
-            if ( 'post' == linkTo ) {
+            if ( 'post' === linkTo ) {
                 $input.val( attachment.get('link') );
-            } else if ( 'file' == linkTo ) {
+            } else if ( 'file' === linkTo ) {
                 $input.val( attachment.get('url') );
             } else if ( ! this.model.get('linkUrl') ) {
@@ -3559 +3596 @@
             }
 
-            $input.prop('readonly', 'custom' !== linkTo);
+            $input.prop( 'readonly', 'custom' !== linkTo );
 
             // If the input is visible, focus and select its contents.

trunk/wp-includes/media.php

@@ -671 +671 @@
 
     if ( ! empty( $attr['ids'] ) ) {
-        // 'ids' is explicitly ordered
-        $attr['orderby'] = 'post__in';
+        // 'ids' is explicitly ordered, unless you specify otherwise.
+        if ( empty( $attr['orderby'] ) )
+            $attr['orderby'] = 'post__in';
         $attr['include'] = $attr['ids'];
     }
@@ -1490 +1491 @@
         'continueEditing'    => __( 'Continue editing' ),
         'addToGallery'       => __( 'Add to gallery' ),
+        'reverseOrder'       => __( 'Reverse order' ),
     );
 
@@ -1866 +1868 @@
             </select>
         </label>
+
+        <label class="setting">
+            <span><?php _e('Random'); ?></span>
+            <input type="checkbox" data-setting="_orderbyRandom" />
+        </label>
     </script>