Changeset 22791

Timestamp:

11/21/2012 08:34:46 PM (13 years ago)

Author:

koopersmith

Message:

Media: Refresh the window-wide uploader whenever a state is activated. Properly unbind controller events. fixes #22504, see #21390.

File:

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

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

@@ -938 +938 @@
                 this.collection.off( null, null, this );
 
+            // Unbind controller events.
+            if ( this.controller && this.controller.off )
+                this.controller.off( null, null, this );
+
             // Recursively dispose child views.
             if ( this.views )
@@ -1045 +1049 @@
             if ( this.options.uploader ) {
                 this.uploader = new media.view.UploaderWindow({
+                    controller: this,
                     uploader: {
                         dropzone:  this.modal ? this.modal.$el : this.$el,
@@ -1733 +1738 @@
             if ( uploader.dropzone && ! (uploader.dropzone instanceof $) )
                 uploader.dropzone = $( uploader.dropzone );
+
+            this.controller.on( 'activate', this.refresh, this );
         },