Changeset 23089

Timestamp:

12/06/2012 03:55:37 AM (12 years ago)

Author:

markjaquith

Message:

New method of managing media selections. There is now a "master" selection in the background. props koopersmith. fixes #22725

• This especially helps when you switch between insert/gallery and have non-images selected (as galleries don't support non-images).
• The views now act as filters on the "master" selection, instead of having their own selections that get passed around.

File:

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

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

@@ -368 +368 @@
 
             // Sync the selection from the last state when 'multiple' matches.
-            syncLastSelection: true
+            syncSelection: true
         },
 
         initialize: function() {
-            if ( ! this.get('selection') ) {
+            var selection = this.get('selection'),
+                props;
+
+            // If a library isn't provided, query all media items.
+            if ( ! this.get('library') )
+                this.set( 'library', media.query() );
+
+            // If a selection instance isn't provided, create one.
+            if ( ! (selection instanceof media.model.Selection) ) {
+                props = selection;
+
+                if ( ! props ) {
+                    props = this.get('library').props.toJSON();
+                    props = _.omit( props, 'orderby', 'query' );
+                }
+
+                // If the `selection` attribute is set to an object,
+                // it will use those values as the selection instance's
+                // `props` model. Otherwise, it will copy the library's
+                // `props` model.
                 this.set( 'selection', new media.model.Selection( null, {
-                    multiple: this.get('multiple')
+                    multiple: this.get('multiple'),
+                    props: props
                 }) );
             }
 
-            if ( ! this.get('library') )
-                this.set( 'library', media.query() );
-
             if ( ! this.get('edge') )
                 this.set( 'edge', 120 );
@@ -391 +408 @@
 
         activate: function() {
-            if ( this.get('syncLastSelection') )
-                this.getLastSelection();
+            this.syncSelection();
 
             wp.Uploader.queue.on( 'add', this.uploading, this );
@@ -407 +423 @@
 
         deactivate: function() {
+            this.recordSelection();
+
             this.frame.off( 'content:activate', this.saveContentMode, this );
 
@@ -456 +474 @@
         },
 
-        getLastSelection: function() {
+        syncSelection: function() {
             var selection = this.get('selection'),
-                lastState = this.frame.lastState(),
-                lastSelection = lastState && lastState.get('selection'),
-                lastMultiple, thisMultiple;
-
-            if ( ! lastSelection )
+                manager = this.frame._selection;
+
+            if ( ! this.get('syncSelection') || ! manager || ! selection )
                 return;
 
-            // We don't care about the method of multiple selection the
-            // selections use, just that they both support (or don't support)
-            // multiple selection.
-            lastMultiple = !! lastSelection.multiple;
-            thisMultiple = !! selection.multiple;
-
-            if ( lastMultiple !== thisMultiple )
+            // If the selection supports multiple items, validate the stored
+            // attachments based on the new selection's conditions. Record
+            // the attachments that are not included; we'll maintain a
+            // reference to those. Other attachments are considered in flux.
+            if ( selection.multiple ) {
+                selection.reset( [], { silent: true });
+                selection.validateAll( manager.attachments );
+                manager.difference = _.difference( manager.attachments.models, selection.models );
+            }
+
+            // Sync the selection's single item with the master.
+            selection.single( manager.single );
+        },
+
+        recordSelection: function() {
+            var selection = this.get('selection'),
+                manager = this.frame._selection,
+                filtered;
+
+            if ( ! this.get('syncSelection') || ! manager || ! selection )
                 return;
 
-            selection.reset( lastSelection.toArray() ).single( lastSelection.single() );
+            // Record the currently active attachments, which is a combination
+            // of the selection's attachments and the set of selected
+            // attachments that this specific selection considered invalid.
+            // Reset the difference and record the single attachment.
+            if ( selection.multiple ) {
+                manager.attachments.reset( selection.toArray().concat( manager.difference ) );
+                manager.difference = [];
+            } else {
+                manager.attachments.add( selection.toArray() );
+            }
+
+            manager.single = selection._single;
         },
 
@@ -528 +568 @@
             title:      l10n.editGalleryTitle,
             priority:   60,
-            dragInfo:   true
+            dragInfo:   true,
+
+            // Don't sync the selection, as the Edit Gallery library
+            // *is* the selection.
+            syncSelection: false
         },
 
@@ -602 +646 @@
             toolbar:      'gallery-add',
             title:        l10n.addToGalleryTitle,
-            priority:     100
+            priority:     100,
+
+            // Don't sync the selection, as the Edit Gallery library
+            // *is* the selection.
+            syncSelection: false
         }, media.controller.Library.prototype.defaults ),
 
@@ -642 +690 @@
             toolbar:    'featured-image',
             title:      l10n.setFeaturedImageTitle,
-            priority:   60
+            priority:   60,
+
+            syncSelection: false
         }, media.controller.Library.prototype.defaults ),
 
@@ -1430 +1480 @@
                 });
             }
+
+            this._selection = {
+                attachments: new Attachments(),
+                difference: []
+            };
         },
 
@@ -1442 +1497 @@
                 // Main states.
                 new media.controller.Library({
-                    selection: options.selection,
                     library:   media.query( options.library ),
                     multiple:  options.multiple,
@@ -1527 +1581 @@
 
         createStates: function() {
-            var options = this.options,
-                selection = options.selection;
+            var options = this.options;
 
             // Add the default states.
@@ -1540 +1593 @@
                     filterable: 'all',
                     library:    media.query( options.library ),
-                    selection:  selection,
                     multiple:   options.multiple ? 'reset' : false,
                     editable:   true,
@@ -1566 +1618 @@
                     library:  media.query( _.defaults({
                         type: 'image'
-                    }, options.library ) ),
-
-                    selection: new media.model.Selection( selection.models, {
-                        multiple: 'add'
-                    })
+                    }, options.library ) )
                 }),