<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27460] trunk/src: Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27460">27460</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-08 00:40:03 +0000 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see <a href="http://core.trac.wordpress.org/ticket/26952">#26952</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludescssjqueryuidialogcss">trunk/src/wp-includes/css/jquery-ui-dialog.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssmediacss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/media.css (27459 => 27460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/media.css 2014-03-07 19:35:55 UTC (rev 27459)
+++ trunk/src/wp-admin/css/media.css 2014-03-08 00:40:03 UTC (rev 27460)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> top: 30px;
</span><span class="cx"> bottom: 30px;
</span><span class="cx"> left: 50%;
</span><del>- z-index: 160000;
</del><ins>+ z-index: 100105;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-box-head {
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> background: #000;
</span><span class="cx"> opacity: 0.7;
</span><del>- z-index: 159900;
</del><ins>+ z-index: 100100;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul#dismissed-updates {
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (27459 => 27460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css 2014-03-07 19:35:55 UTC (rev 27459)
+++ trunk/src/wp-includes/css/editor.css 2014-03-08 00:40:03 UTC (rev 27460)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> /* TinyMCE windows */
</span><span class="cx"> #mce-modal-block.mce-in {
</span><span class="cx"> opacity: 0.7;
</span><del>- z-index: 159900 !important; /* Overwrite inline style added by TinyMCE. */
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-window {
</span><span class="lines">@@ -21,7 +20,6 @@
</span><span class="cx"> border-radius: 0;
</span><span class="cx"> -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</span><span class="cx"> box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</span><del>- z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
</del><span class="cx"> -webkit-font-smoothing: subpixel-antialiased;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -837,7 +835,7 @@
</span><span class="cx"> padding: 2px;
</span><span class="cx"> position: absolute;
</span><span class="cx"> display: none;
</span><del>- z-index: 155000;
</del><ins>+ z-index: 100020;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp_editimgbtn,
</span><span class="lines">@@ -1474,7 +1472,7 @@
</span><span class="cx"> * =Overlay Styles
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx"> .fullscreen-overlay {
</span><del>- z-index: 149999;
</del><ins>+ z-index: 100005;
</ins><span class="cx"> display: none;
</span><span class="cx"> position: fixed;
</span><span class="cx"> top: 0;
</span><span class="lines">@@ -1502,7 +1500,7 @@
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> #wp-fullscreen-body {
</span><del>- z-index: 150005;
</del><ins>+ z-index: 100010;
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1514,7 +1512,7 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> bottom: 30px;
</span><span class="cx"> top: 60px;
</span><del>- z-index: 150010;
</del><ins>+ z-index: 100015;
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1580,7 +1578,7 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> top: 0;
</span><span class="cx"> width: 100%;
</span><del>- z-index: 150050;
</del><ins>+ z-index: 100020;
</ins><span class="cx"> -webkit-transition: opacity 0.4s;
</span><span class="cx"> transition: opacity 0.4s;
</span><span class="cx"> }
</span><span class="lines">@@ -1719,23 +1717,13 @@
</span><span class="cx"> /* =Thickbox Adjustments
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx"> .wp-fullscreen-active #TB_overlay {
</span><del>- z-index: 150100;
</del><ins>+ z-index: 100050;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wp-fullscreen-active #TB_window {
</span><del>- z-index: 150102;
</del><ins>+ z-index: 100051;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* =TinyMCE Adjustments
--------------------------------------------------------------- */
-.wp-fullscreen-active #mce-modal-block {
- z-index: 150100 !important;
-}
-
-.wp-fullscreen-active .mce-window {
- z-index: 150102 !important;
-}
-
</del><span class="cx"> /* Colors */
</span><span class="cx"> .fullscreen-overlay {
</span><span class="cx"> background: #fff;
</span></span></pre></div>
<a id="trunksrcwpincludescssjqueryuidialogcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/jquery-ui-dialog.css (27459 => 27460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/jquery-ui-dialog.css 2014-03-07 19:35:55 UTC (rev 27459)
+++ trunk/src/wp-includes/css/jquery-ui-dialog.css 2014-03-08 00:40:03 UTC (rev 27460)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> /* WP jQuery Dialog Theme */
</span><span class="cx"> .wp-dialog {
</span><span class="cx"> padding: 0;
</span><del>- z-index: 300002;
</del><ins>+ z-index: 100102;
</ins><span class="cx"> border: 0;
</span><span class="cx"> -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</span><span class="cx"> box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .ui-widget-overlay {
</span><del>- z-index: 300001;
</del><ins>+ z-index: 100101;
</ins><span class="cx"> background-color: #000;
</span><span class="cx"> opacity: 0.6;
</span><span class="cx"> filter: alpha(opacity=60);
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (27459 => 27460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-07 19:35:55 UTC (rev 27459)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-08 00:40:03 UTC (rev 27460)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><del>-/* global tinymce, getUserSetting, setUserSetting, switchEditors */
</del><ins>+/* global tinymce, getUserSetting, setUserSetting */
+
+// Set the minimum value for the modals z-index higher than #wpadminbar (100000)
+tinymce.ui.FloatPanel.zIndex = 100100;
+
</ins><span class="cx"> tinymce.PluginManager.add( 'wordpress', function( editor ) {
</span><span class="cx"> var DOM = tinymce.DOM, wpAdvButton, modKey, style,
</span><span class="cx"> last = 0;
</span><span class="lines">@@ -279,7 +283,8 @@
</span><span class="cx"> var env = tinymce.Env, topx, reset,
</span><span class="cx"> deltax = 0,
</span><span class="cx"> bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
</span><del>- doc = editor.getDoc();
</del><ins>+ doc = editor.getDoc(),
+ dom = editor.dom;
</ins><span class="cx">
</span><span class="cx"> if ( editor.getParam( 'directionality' ) === 'rtl' ) {
</span><span class="cx"> bodyClass.push('rtl');
</span><span class="lines">@@ -299,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> tinymce.each( bodyClass, function( cls ) {
</span><span class="cx"> if ( cls ) {
</span><del>- editor.dom.addClass( doc.body, cls );
</del><ins>+ dom.addClass( doc.body, cls );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -318,7 +323,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! ( 'ontouchstart' in window ) ) {
</span><span class="cx"> // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
</span><del>- editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
</del><ins>+ dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
</ins><span class="cx"> var delta, top,
</span><span class="cx"> docElement = doc.documentElement;
</span><span class="cx">
</span><span class="lines">@@ -370,6 +375,13 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx"> }
</span><ins>+
+ dom.bind( doc, 'dragover', function( event ) {
+ if ( typeof window.jQuery !== 'undefined' ) {
+ // Propagate the event to its container for the parent window to catch.
+ window.jQuery( editor.getContainer() ).trigger( event );
+ }
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Word count
</span><span class="lines">@@ -399,8 +411,8 @@
</span><span class="cx"> // Keep empty paragraphs :(
</span><span class="cx"> e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p> </p>' );
</span><span class="cx">
</span><del>- if ( editor.getParam( 'wpautop', true ) && typeof switchEditors !== 'undefined' ) {
- e.content = switchEditors.pre_wpautop( e.content );
</del><ins>+ if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
+ e.content = window.switchEditors.pre_wpautop( e.content );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -442,13 +454,6 @@
</span><span class="cx"> editor.dom.bind( editor.getBody(), 'dragstart', function() {
</span><span class="cx"> _hideButtons();
</span><span class="cx"> });
</span><del>-
- editor.dom.bind( editor.getWin(), 'dragover', function(e) {
- if ( typeof window.jQuery !== 'undefined' ) {
- // Propagate the event to its container for the parent window to catch.
- jQuery( editor.getContainer() ).trigger(e);
- }
- });
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'BeforeExecCommand', function() {
</span></span></pre>
</div>
</div>
</body>
</html>