Media: ensure the toolbar is shown after leaving iframe-based content. Props mcsf, fixes #30608.

Built from https://develop.svn.wordpress.org/trunk@30780


git-svn-id: http://core.svn.wordpress.org/trunk@30770 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/js/media-views.js

@@ -2395,6 +2395,7 @@
 			}, this );
 
 			this.on( 'content:create:iframe', this.iframeContent, this );
+			this.on( 'content:deactivate:iframe', this.iframeContentCleanup, this );
 			this.on( 'menu:render:default', this.iframeMenu, this );
 			this.on( 'open', this.hijackThickbox, this );
 			this.on( 'close', this.restoreThickbox, this );
@@ -2411,6 +2412,10 @@
 			});
 		},
 
+		iframeContentCleanup: function( content ) {
+			this.$el.removeClass('hide-toolbar');
+		},
+
 		iframeMenu: function( view ) {
 			var views = {};
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30779';
+$wp_version = '4.1-beta2-30780';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.