Changeset 27460

Timestamp:

03/08/2014 12:40:03 AM (11 years ago)

Author:

azaozz

Message:

Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952

Location:

trunk/src

Files:

• wp-admin/css/media.css (modified) (2 diffs)
• wp-includes/css/editor.css (modified) (8 diffs)
• wp-includes/css/jquery-ui-dialog.css (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (7 diffs)

trunk/src/wp-admin/css/media.css

@@ -242 +242 @@
     bottom: 30px;
     left: 50%;
-    z-index: 160000;
+    z-index: 100105;
 }
 
@@ -358 +358 @@
     background: #000;
     opacity: 0.7;
-    z-index: 159900;
+    z-index: 100100;
 }
 

trunk/src/wp-includes/css/editor.css

@@ -14 +14 @@
 #mce-modal-block.mce-in {
     opacity: 0.7;
-    z-index: 159900 !important; /* Overwrite inline style added by TinyMCE. */
 }
 
@@ -22 +21 @@
     -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
     box-shadow: 0 5px 15px rgba(0,0,0,0.7);
-    z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
     -webkit-font-smoothing: subpixel-antialiased;
 }
@@ -838 +836 @@
     position: absolute;
     display: none;
-    z-index: 155000;
+    z-index: 100020;
 }
 
@@ -1475 +1473 @@
 -------------------------------------------------------------- */
 .fullscreen-overlay {
-    z-index: 149999;
+    z-index: 100005;
     display: none;
     position: fixed;
@@ -1503 +1501 @@
 
 #wp-fullscreen-body {
-    z-index: 150005;
+    z-index: 100010;
     display: none;
 }
@@ -1515 +1513 @@
     bottom: 30px;
     top: 60px;
-    z-index: 150010;
+    z-index: 100015;
 
 }
@@ -1581 +1579 @@
     top: 0;
     width: 100%;
-    z-index: 150050;
+    z-index: 100020;
     -webkit-transition: opacity 0.4s;
     transition: opacity 0.4s;
@@ -1720 +1718 @@
 -------------------------------------------------------------- */
 .wp-fullscreen-active #TB_overlay {
-    z-index: 150100;
+    z-index: 100050;
 }
 
 .wp-fullscreen-active #TB_window {
-    z-index: 150102;
-}
-
-/* =TinyMCE Adjustments
--------------------------------------------------------------- */
-.wp-fullscreen-active #mce-modal-block {
-    z-index: 150100 !important;
-}
-
-.wp-fullscreen-active .mce-window {
-    z-index: 150102 !important;
+    z-index: 100051;
 }
 

trunk/src/wp-includes/css/jquery-ui-dialog.css

@@ -253 +253 @@
 .wp-dialog {
     padding: 0;
-    z-index: 300002;
+    z-index: 100102;
     border: 0;
     -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
@@ -313 +313 @@
 
 .ui-widget-overlay {
-    z-index: 300001;
+    z-index: 100101;
     background-color: #000;
     opacity: 0.6;

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

@@ -1 @@
-/* global tinymce, getUserSetting, setUserSetting, switchEditors */
+/* global tinymce, getUserSetting, setUserSetting */
+
+// Set the minimum value for the modals z-index higher than #wpadminbar (100000)
+tinymce.ui.FloatPanel.zIndex = 100100;
+
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
     var DOM = tinymce.DOM, wpAdvButton, modKey, style,
@@ -280 +284 @@
             deltax = 0,
             bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
-            doc = editor.getDoc();
+            doc = editor.getDoc(),
+            dom = editor.dom;
 
         if ( editor.getParam( 'directionality' ) === 'rtl' ) {
@@ -300 +305 @@
         tinymce.each( bodyClass, function( cls ) {
             if ( cls ) {
-                editor.dom.addClass( doc.body, cls );
+                dom.addClass( doc.body, cls );
             }
         });
@@ -319 +324 @@
         if ( ! ( 'ontouchstart' in window ) ) {
             // When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
-            editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
+            dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
                 var delta, top,
                     docElement = doc.documentElement;
@@ -371 +376 @@
             });
         }
+
+        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 );
+            }
+        });
     });
 
@@ -400 +412 @@
         e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p>&nbsp;</p>' );
 
-        if ( editor.getParam( 'wpautop', true ) && typeof switchEditors !== 'undefined' ) {
-            e.content = switchEditors.pre_wpautop( e.content );
+        if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
+            e.content = window.switchEditors.pre_wpautop( e.content );
         }
     });
@@ -443 +455 @@
             _hideButtons();
         });
-
-        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);
-            }
-        });
     });