Changeset 27276

Timestamp:

02/25/2014 09:02:22 PM (12 years ago)

Author:

azaozz

Message:

When closing the various "edit" media modals, remove the related views elements from the DOM. Props gcorne, fixes #27204.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (1 diff)
• tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)
• tinymce/plugins/wpgallery/plugin.js (modified) (3 diffs)

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

@@ -2769 +2769 @@
 
                         this.controller.on( 'activate', this.refresh, this );
+
+                        this.controller.on( 'detach', function() {
+                                this.$browser.remove();
+                        }, this );
                 },
 

trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -289 +289 @@
                         updateImage( img, imageData );
                         editor.focus();
+                        frame.detach();
                 };
 
@@ -295 +296 @@
                 frame.on( 'close', function() {
                         editor.focus();
-        //              editor.selection.select( img );
-        //              editor.nodeChanged();
+                        frame.detach();
                 });
 

trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js

@@ -74 +74 @@
                                 var shortcode = gallery.shortcode( selection ).string();
                                 editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
+                                frame.detach();
                         });
                 } else if ( editor.dom.hasClass( node, 'wp-playlist' ) && wp.media.playlist ) {
@@ -82 +83 @@
                                 var shortcode = wp.media.playlist.shortcode( selection ).string();
                                 editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
+                                frame.detach();
                         });
                 } else if ( editor.dom.hasClass( node, 'wp-video-playlist' ) && wp.media['video-playlist'] ) {
@@ -90 +92 @@
                                 var shortcode = wp.media['video-playlist'].shortcode( selection ).string();
                                 editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
+                                frame.detach();
                         });
                 } else {