Changeset 22957

Timestamp:

11/30/2012 04:45:43 PM (12 years ago)

Author:

ryan

Message:

Resolve race conditions in Attachments.more().

Props koopersmith
fixes #22656

File:

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

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

@@ -3072 +3072 @@
         },
 
+        removeContent: function() {
+            _.each(['attachments','uploader'], function( key ) {
+                if ( this[ key ] ) {
+                    this[ key ].remove();
+                    delete this[ key ];
+                }
+            }, this );
+        },
+
         createUploader: function() {
-            if ( this.attachments ) {
-                this.attachments.remove();
-                delete this.attachments;
-            }
+            this.removeContent();
 
             this.uploader = new media.view.UploaderInline({
@@ -3086 +3092 @@
 
         createAttachments: function() {
-            if ( this.uploader ) {
-                this.uploader.remove();
-                delete this.uploader;
-            }
+            this.removeContent();
 
             this.attachments = new media.view.Attachments({