Changeset 22454

Timestamp:

11/07/2012 10:43:16 PM (12 years ago)

Author:

koopersmith

Message:

Media: Improve memory management of views, events, and DOM nodes. see #21390.

File:

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

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

@@ -102 +102 @@
 
             if ( previous ) {
+                // Replace the view in place.
+                previous.$el.replaceWith( view.$el );
+
                 // Fire the view's `destroy` event if it exists.
                 if ( previous.destroy )
@@ -107 +110 @@
                 // Undelegate events.
                 previous.undelegateEvents();
-
-                // Replace the view in place.
-                previous.$el.replaceWith( view.$el );
             }
 
@@ -1068 +1068 @@
         destroy: function() {
             wp.Uploader.queue.off( 'add remove reset change:percent', this.renderUploadProgress, this );
+            this.remove();
         },
 
@@ -1125 +1126 @@
 
         destroy: function() {
+            this.remove();
             _.each( this._views, function( view ) {
                 if ( view.destroy )
@@ -1405 +1407 @@
 
         destroy: function() {
+            this.remove();
             _.each( this._views, function( view ) {
                 if ( view.destroy )
@@ -1563 +1566 @@
             this.model.off( null, null, this );
             this.$el.off( 'click', 'a', this.preventDefault );
+            this.remove();
         },
 
@@ -1754 +1758 @@
             this.model.off( 'change:edge change:gutter', this.css, this );
             $(window).off( 'resize.attachments', this._resizeCss );
+            this.remove();
         },
 
@@ -1963 +1968 @@
                 AttachmentView: this.options.AttachmentView
             });
+        },
+
+        destroy: function() {
+            this.remove();
+            this.toolbar.destroy();
+            this.attachments.destroy();
         },
 
@@ -2059 +2070 @@
 
         destroy: function() {
+            this.remove();
             this.collection.off( 'add remove reset', this.refresh, this );
+            this.attachments.destroy();
         },