From 6423fba2c466e87d02751cf3998137b24fd0c85c Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Wed, 21 Nov 2012 19:54:06 +0000 Subject: [PATCH] Media: Make inline uploader use main dispose method. see #21390. git-svn-id: https://develop.svn.wordpress.org/trunk@22787 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/js/media-views.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index cb18293c72..aae6dc21c2 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -1809,9 +1809,10 @@ wp.Uploader.queue.on( 'add remove reset change:percent', this.renderUploadProgress, this ); }, - destroy: function() { - wp.Uploader.queue.off( 'add remove reset change:percent', this.renderUploadProgress, this ); - this.remove(); + dispose: function() { + wp.Uploader.queue.off( null, null, this ); + media.View.prototype.dispose.apply( this, arguments ); + return this; }, render: function() { @@ -1827,6 +1828,8 @@ $placeholder.replaceWith( $browser.show() ); this.$bar = this.$('.media-progress-bar div'); + + this.views.render(); return this; },