WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: fix setting of zIndex on the dialogs. 

Props subrataemfluence, azaozz.
Merges [43181] to the 4.9 branch.
Fixes #43984.
Built from https://develop.svn.wordpress.org/branches/4.9@43182


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2018-05-08 20:57:28 +00:00
parent 1d2fd8ef87
commit cca8f1053b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/js/customize-controls.js
View File

@ -9284,8 +9284,8 @@
api.bind( 'change', startAutosaving ); api.bind( 'change', startAutosaving );
// Make sure TinyMCE dialogs appear above Customizer UI. // Make sure TinyMCE dialogs appear above Customizer UI.
$( document ).one( 'wp-before-tinymce-init', function() { $( document ).one( 'tinymce-editor-setup', function() {
if ( ! window.tinymce.ui.FloatPanel.zIndex || window.tinymce.ui.FloatPanel.zIndex < 500001 ) { if ( window.tinymce.ui.FloatPanel && ( ! window.tinymce.ui.FloatPanel.zIndex || window.tinymce.ui.FloatPanel.zIndex < 500001 ) ) {
window.tinymce.ui.FloatPanel.zIndex = 500001; window.tinymce.ui.FloatPanel.zIndex = 500001;
} }
} ); } );

2
wp-admin/js/customize-controls.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.9.6-beta1-43176'; $wp_version = '4.9.6-beta1-43182';
/** /**
* 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.