Changeset 22477

Timestamp:

11/09/2012 01:23:20 AM (12 years ago)

Author:

koopersmith

Message:

Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models. see #21390.

Location:

trunk/wp-includes/js

Files:

• media-models.js (modified) (2 diffs)
• media-views.js (modified) (4 diffs)

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

@@ -742 +742 @@
         observe: function( attachments, options ) {
             var silent = options && options.silent;
+            this.observers = this.observers || [];
+            this.observers.push( attachments );
 
             attachments.on( 'add remove',  silent ? this._evaluateSilentHandler : this._evaluateHandler, this );
@@ -747 +749 @@
 
             this.evaluateAll( attachments, options );
+            return this;
         },
 
         unobserve: function( attachments ) {
-            attachments.off( 'add remove', this._evaluateHandler, this );
-            attachments.off( 'reset', this._evaluateAllHandler, this );
+            if ( attachments ) {
+                attachments.off( null, null, this );
+                this.observers = _.without( this.observers, attachments );
+
+            } else {
+                _.each( this.observers, function( attachments ) {
+                    attachments.off( null, null, this );
+                }, this );
+                delete this.observers;
+            }
+
+            return this;
         },
 

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

@@ -292 +292 @@
             var selection = this.get('selection');
 
+            this._excludeStateLibrary();
+            this.buildComposite();
+            this.on( 'change:library change:exclude', this.buildComposite, this );
+            this.on( 'change:excludeState', this._excludeState, this );
+
             // If we're in a workflow that supports multiple attachments,
             // automatically select any uploading attachments.
@@ -307 +312 @@
 
         deactivate: function() {
+            this.off( 'change:library change:exclude', this.buildComposite, this );
+            this.off( 'change:excludeState', this._excludeState, this );
+            this.destroyComposite();
+
             wp.Uploader.queue.off( 'add', this.selectUpload, this );
 
@@ -376 +385 @@
 
             return this;
+        },
+
+        buildComposite: function() {
+            var original = this.get('_library'),
+                exclude = this.get('exclude'),
+                composite;
+
+            this.destroyComposite();
+            if ( ! this.get('exclude') )
+                return;
+
+            // Remember the state's original library.
+            if ( ! original )
+                this.set( '_library', original = this.get('library') );
+
+            // Create a composite library in its place.
+            composite = new media.model.Composite( null, {
+                props: _.pick( original.props.toJSON(), 'order', 'orderby' )
+            });
+
+            // Accepts attachments that exist in the original library and
+            // that do not exist in the excluded library.
+            composite.validator = function( attachment ) {
+                return !! original.getByCid( attachment.cid ) && ! exclude.getByCid( attachment.cid );
+            };
+
+            composite.observe( original ).observe( exclude );
+
+            // When `more()` is triggered on the composite collection,
+            // pass the command over to the `original`, which will
+            // populate the query.
+            composite.more = _.bind( original.more, original );
+
+            this.set( 'library', composite );
+        },
+
+        destroyComposite: function() {
+            var composite = this.get('library'),
+                original = this.get('_library');
+
+            if ( ! original )
+                return;
+
+            composite.unobserve();
+            this.set( 'library', original );
+            this.unset('_library');
+        },
+
+        _excludeState: function() {
+            var current = this.get('excludeState'),
+                previous = this.previous('excludeState');
+
+            if ( previous )
+                this.frame.get( previous ).off( 'change:library', this._excludeStateLibrary, this );
+
+            if ( current )
+                this.frame.get( previous ).on( 'change:library', this._excludeStateLibrary, this );
+        },
+
+        _excludeStateLibrary: function() {
+            var current = this.get('excludeState');
+
+            if ( ! current )
+                return;
+
+            this.set( 'exclude', this.frame.get( current ).get('library') );
         }
     });
@@ -660 +735 @@
                 new media.controller.Library( _.defaults({
                     id:      'gallery-library',
-                    library: media.query({ type: 'image' })
+                    library: media.query({ type: 'image' }),
+                    excludeState: 'gallery-edit'
                 }, gallery ) ),
 
                 new media.controller.Upload( _.defaults({
-                    id: 'gallery-upload'
+                    id: 'gallery-upload',
+                    excludeState: 'gallery-edit'
                 }, gallery ) )
             ]);
 
-            this.get('gallery-edit').on( 'change:library', this.updateGalleryLibraries, this ).set({
-                library: options.selection
-            });
-
             // Set the default state.
             this.state( options.state );
-        },
-
-        updateGalleryLibraries: function() {
-            var editLibrary = this.get('gallery-edit').get('library');
-
-            _.each(['gallery-library','gallery-upload'], function( id ) {
-                var state = this.get( id ),
-                    original = state.get('_library'),
-                    composite;
-
-                // Remember the state's original library.
-                if ( ! original )
-                    state.set( '_library', original = state.get('library') );
-
-                // Create a composite library in its place.
-                composite = new media.model.Composite( null, {
-                    props: _.pick( original.props.toJSON(), 'order', 'orderby' )
-                });
-
-                // Accepts attachments that exist in the original library and
-                // that do not exist in the state's library.
-                composite.validator = function( attachment ) {
-                    return !! original.getByCid( attachment.cid ) && ! editLibrary.getByCid( attachment.cid );
-                };
-
-                composite.observe( original );
-                composite.observe( editLibrary );
-
-                // When `more()` is triggered on the composite collection,
-                // pass the command over to the `original`, which will
-                // populate the query.
-                composite.more = _.bind( original.more, original );
-
-                state.set( 'library', composite );
-            }, this );
         },