Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

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

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


git-svn-id: http://core.svn.wordpress.org/trunk@30770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-12-07 21:12:21 +00:00
parent 24090d065a
commit 31990810f4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/js/media-views.js
View File

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

6
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.