Changeset 22508

Timestamp:

11/09/2012 12:37:21 PM (12 years ago)

Author:

koopersmith

Message:

Media: Keep track of gallery display properties in a separate model instead of mixed in with the query parameters. This allows for arbitrary gallery arguments and a more flexible data structure. see #21390.

Location:

trunk/wp-includes/js

Files:

• mce-view.js (modified) (6 diffs)
• media-views.js (modified) (1 diff)

trunk/wp-includes/js/mce-view.js

@@ -601 +601 @@
                     var shortcodeString = shortcode.string(),
                         result = galleries[ shortcodeString ],
-                        attrs, args, query;
+                        attrs, args, query, others;
 
                     delete galleries[ shortcodeString ];
@@ -628 +628 @@
                         args.parent = attrs.id || parent;
 
+                    // Collect the attributes that were not included in `args`.
+                    others = {};
+                    _.filter( attrs, function( value, key ) {
+                        if ( _.isUndefined( args[ key ] ) )
+                            others[ key ] = value;
+                    });
+
                     query = media.query( args );
-                    query.props.set( _.pick( attrs, 'columns', 'link' ) );
+                    query.gallery = new Backbone.Model( others );
                     return query;
                 },
@@ -635 +642 @@
                 shortcode: function( attachments ) {
                     var props = attachments.props.toJSON(),
-                        attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order', 'link', 'columns' ),
-                        shortcode;
+                        attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
+                        shortcode, clone;
+
+                    if ( attachments.gallery )
+                        _.extend( attrs, attachments.gallery.toJSON() );
 
                     attrs.ids = attachments.pluck('id');
@@ -652 +662 @@
 
                     // Use a cloned version of the gallery.
-                    galleries[ shortcode.string() ] = new wp.media.model.Attachments( attachments.models, {
+                    clone = new wp.media.model.Attachments( attachments.models, {
                         props: props
                     });
+                    clone.gallery = attachments.gallery;
+                    galleries[ shortcode.string() ] = clone;
 
                     return shortcode;
@@ -706 +718 @@
 
             edit: function() {
+                var selection;
+
                 if ( ! wp.media.view || this.frame )
                     return;
+
+                selection = new wp.media.model.Selection( this.attachments.models, {
+                    props:    this.attachments.props.toJSON(),
+                    multiple: true
+                });
+                selection.gallery = this.attachments.gallery;
 
                 this.frame = wp.media({
@@ -715 +735 @@
                     editing:   true,
                     multiple:  true,
-                    selection: new wp.media.model.Selection( this.attachments.models, {
-                        props:    this.attachments.props.toJSON(),
-                        multiple: true
-                    })
+                    selection: selection
                 });
 

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

@@ -1032 +1032 @@
         // Sidebars
         onSidebarGallerySettings: function( options ) {
+            var library = this.state().get('library');
+
+            library.gallery = library.gallery || new Backbone.Model();
+
             this.sidebar.view().add({
                 gallery: new media.view.Settings.Gallery({
                     controller: this,
-                    model:      this.state().get('library').props,
+                    model:      library.gallery,
                     priority:   40
                 }).render()