Changeset 22662

Timestamp:

11/19/2012 06:02:00 AM (12 years ago)

Author:

koopersmith

Message:

Media: Add default render method to views.

• Use default render method in the Frame view.
• Rename Views.attach to Views.insert.
• Add Views.all to retrieve all subviews.
• Add Views.detach to detach all subviews.
• Detect whether views are going to be reused in View.set and detach them instead of calling dispose.

see #21390.

File:

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

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

@@ -575 +575 @@
 
     _.extend( media.Views.prototype, {
+        all: function() {
+            return _.flatten( this._views );
+        },
+
         get: function( selector ) {
             selector = selector || '';
@@ -593 +597 @@
             existing = this.get( selector );
             next     = views;
-            method   = add ? 'attach' : 'replace';
+            method   = add ? 'insert' : 'replace';
 
             if ( existing ) {
@@ -602 +606 @@
                         next = existing.splice.apply( existing, [ options.at, 0 ].concat( views ) );
                 } else {
-                    this.unset( selector );
-                    _.invoke( existing, 'dispose' );
+                    _.each( next, function( view ) {
+                        view.__detach = true;
+                    });
+
+                    _.each( existing, function( view ) {
+                        if ( view.__detach )
+                            view.$el.detach();
+                        else
+                            view.dispose();
+                    });
+
+                    _.each( next, function( view ) {
+                        delete view.__detach;
+                    });
                 }
             }
@@ -635 +651 @@
             }
 
-            views = _.isArray( views ) ? views : [ views ];
-
-            if ( existing = this.get( selector ) )
-                this._views[ selector ] = _.difference( existing, views );
-
+            if ( existing = this.get( selector ) ) {
+                views = _.isArray( views ) ? views : [ views ];
+                this._views[ selector ] = views.length ? _.difference( existing, views ) : [];
+            }
+
+            return this;
+        },
+
+        detach: function() {
+            $( _.pluck( this.all(), 'el' ) ).detach();
             return this;
         },
@@ -661 +682 @@
             delete this.selector;
 
-            _.chain( this._views ).flatten().invoke('dispose');
+            _.invoke( this.all(), 'dispose' );
             this._views = [];
+            return this;
         },
 
@@ -670 +692 @@
         },
 
-        attach: function( $target, els, options ) {
+        insert: function( $target, els, options ) {
             var at = options && options.at,
                 $children;
@@ -718 +740 @@
             this.dispose();
             return Backbone.View.prototype.remove.apply( this, arguments );
+        },
+
+        render: function() {
+            var options;
+
+            this.views.detach();
+
+            if ( this.template ) {
+                options = this.prepare ? this.prepare() : {};
+                this.trigger( 'prepare', options );
+                this.$el.html( this.template( options ) );
+            }
+
+            this.views.render();
+            return this;
+        },
+
+        prepare: function() {
+            return this.options;
         }
     });
@@ -754 +795 @@
                 model.frame = this;
             }, this );
-        },
-
-        render: function() {
-            if ( ! this.template )
-                return;
-
-            this.$el.html( this.template( this.options ) );
-            this.views.render();
-            return this;
         },