WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://core.svn.wordpress.org/trunk@22454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-07 22:43:16 +00:00
parent 8fcea700bd
commit 4daeaf464d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/js/media-views.js
View File

@ -101,14 +101,14 @@
// this.$el.removeClass( 'hide-' + subview ); // this.$el.removeClass( 'hide-' + subview );
if ( previous ) { if ( previous ) {
// Replace the view in place.
previous.$el.replaceWith( view.$el );
// Fire the view's `destroy` event if it exists. // Fire the view's `destroy` event if it exists.
if ( previous.destroy ) if ( previous.destroy )
previous.destroy(); previous.destroy();
// Undelegate events. // Undelegate events.
previous.undelegateEvents(); previous.undelegateEvents();
// Replace the view in place.
previous.$el.replaceWith( view.$el );
} }
this._view = view; this._view = view;
@ -1067,6 +1067,7 @@
destroy: function() { destroy: function() {
wp.Uploader.queue.off( 'add remove reset change:percent', this.renderUploadProgress, this ); wp.Uploader.queue.off( 'add remove reset change:percent', this.renderUploadProgress, this );
this.remove();
}, },
render: function() { render: function() {
@ -1124,6 +1125,7 @@
}, },
destroy: function() { destroy: function() {
this.remove();
_.each( this._views, function( view ) { _.each( this._views, function( view ) {
if ( view.destroy ) if ( view.destroy )
view.destroy(); view.destroy();
@ -1404,6 +1406,7 @@
}, },
destroy: function() { destroy: function() {
this.remove();
_.each( this._views, function( view ) { _.each( this._views, function( view ) {
if ( view.destroy ) if ( view.destroy )
view.destroy(); view.destroy();
@ -1562,6 +1565,7 @@
destroy: function() { destroy: function() {
this.model.off( null, null, this ); this.model.off( null, null, this );
this.$el.off( 'click', 'a', this.preventDefault ); this.$el.off( 'click', 'a', this.preventDefault );
this.remove();
}, },
render: function() { render: function() {
@ -1753,6 +1757,7 @@
this.collection.off( 'add remove reset', null, this ); this.collection.off( 'add remove reset', null, this );
this.model.off( 'change:edge change:gutter', this.css, this ); this.model.off( 'change:edge change:gutter', this.css, this );
$(window).off( 'resize.attachments', this._resizeCss ); $(window).off( 'resize.attachments', this._resizeCss );
this.remove();
}, },
css: function() { css: function() {
@ -1964,6 +1969,12 @@
}); });
}, },
destroy: function() {
this.remove();
this.toolbar.destroy();
this.attachments.destroy();
},
render: function() { render: function() {
this.toolbar.$el.detach(); this.toolbar.$el.detach();
this.attachments.$el.detach(); this.attachments.$el.detach();
@ -2058,7 +2069,9 @@
}, },
destroy: function() { destroy: function() {
this.remove();
this.collection.off( 'add remove reset', this.refresh, this ); this.collection.off( 'add remove reset', this.refresh, this );
this.attachments.destroy();
}, },
render: function() { render: function() {