Ticket #30453: 30453.patch

src/wp-admin/css/edit.css

@@ -435 +435 @@
         z-index: 999;
 }
 
+/* TinyMCE native fullscreen mode override */
+.mce-fullscreen #wp-content-wrap .mce-menubar,
+.mce-fullscreen #wp-content-wrap .mce-toolbar-grp,
+.mce-fullscreen #wp-content-wrap .mce-edit-area,
+.mce-fullscreen #wp-content-wrap .mce-statusbar {
+        position: static !important;
+        width: auto !important;
+        padding: 0 !important;
+}
+
+.mce-fullscreen #wp-content-wrap .mce-statusbar {
+        visibility: visible !important;
+}
+
+.post-php.mce-fullscreen #wpadminbar,
+.mce-fullscreen #wp-content-wrap .mce-wp-dfw {
+        display: none;
+}
+/* End TinyMCE native fullscreen mode override */
+
 #wp-content-editor-tools {
         background-color: #f1f1f1;
         padding-top: 20px;

src/wp-admin/edit-form-advanced.php

@@ -512 +512 @@
 <div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
 
 <?php wp_editor( $post->post_content, 'content', array(
+        '_content_editor_dfw' => true,
         'drag_drop_upload' => true,
         'tabfocus_elements' => 'content-html,save-post',
         'editor_height' => 300,

src/wp-admin/js/editor-expand.js

@@ -242 +242 @@
                                 }
                         }
 
+                        function mceFullscreenToggled( event ) {
+                                if ( ! event.state ) {
+                                        adjust();
+                                }
+                        }
+
                         // Adjust when switching editor modes.
                         function mceShow() {
                                 $window.on( 'scroll.mce-float-panels', hideFloatPanels );
@@ -280 +286 @@
                                 editor.on( 'wp-toolbar-toggle', toggleAdvanced );
                                 // Adjust when the editor resizes.
                                 editor.on( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
-                                // Don't hide the caret after undo/redo
+                                // Don't hide the caret after undo/redo.
                                 editor.on( 'undo redo', mceScroll );
+                                // Adjust when exiting TinyMCE's fullscreen mode.
+                                editor.on( 'FullscreenStateChanged', mceFullscreenToggled );
 
                                 $window.off( 'scroll.mce-float-panels' ).on( 'scroll.mce-float-panels', hideFloatPanels );
                         };
@@ -293 +301 @@
                                 editor.off( 'wp-toolbar-toggle', toggleAdvanced );
                                 editor.off( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
                                 editor.off( 'undo redo', mceScroll );
+                                editor.off( 'FullscreenStateChanged', mceFullscreenToggled );
 
                                 $window.off( 'scroll.mce-float-panels' );
                         };

src/wp-includes/class-wp-editor.php

@@ -278 +278 @@
                         if ( $set['dfw'] )
                                 $qtInit['buttons'] .= ',fullscreen';
 
-                        if ( $editor_id === 'content' && ! wp_is_mobile() )
+                        if ( $set['_content_editor_dfw'] ) {
                                 $qtInit['buttons'] .= ',dfw';
+                        }
 
                         /**
                          * Filter the Quicktags settings.
@@ -549 +550 @@
                                 $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
                                 $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
                         } else {
-                                $mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker', 'wp_adv' );
+                                $mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
 
-                                if ( $editor_id ) {
+                                if ( $set['_content_editor_dfw'] ) {
                                         $mce_buttons[] = 'dfw';
                                 } else {
                                         $mce_buttons[] = 'fullscreen';
                                 }
 
+                                $mce_buttons[] = 'wp_adv';
+
                                 /**
                                  * Filter the first-row list of TinyMCE buttons (Visual tab).
                                  *

src/wp-includes/css/editor.css

@@ -1099 +1099 @@
         margin: 5px 5px 0 0;
 }
 
+.qt-fullscreen {
+        position: static;
+        margin: 2px;
+}
+
 @media screen and ( max-width: 782px ) {
         .mce-toolbar .mce-btn button,
         .qt-dfw {

src/wp-includes/js/quicktags.js

@@ -301 +301 @@
                         ed.toolbar.innerHTML = html;
                         ed.theButtons = theButtons;
 
-                        window.jQuery && window.jQuery( document ).trigger( 'quicktags-init', [ ed ] );
+                        if ( typeof jQuery !== 'undefined' ) {
+                                jQuery( document ).triggerHandler( 'quicktags-init', [ ed ] );
+                        }
                 }
                 t.buttonsInitDone = true;
         };
@@ -416 +418 @@
                         dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
 
                 if ( this.id === 'fullscreen' ) {
-                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw"' + title + '></button>';
+                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw qt-fullscreen"' + title + '></button>';
                 } else if ( this.id === 'dfw' ) {
                         active = dfw && dfw.isActive() ? '' : ' disabled="disabled"';
                         on = dfw && dfw.isOn() ? ' active' : '';

src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js

@@ -65 +65 @@
                 tooltip: 'Distraction Free Writing',
                 shortcut: 'Alt+Shift+W',
                 onclick: toggleFullscreen,
-                classes: 'wp-dfw btn widget' // This overwrites all classes on the container!
+                classes: 'wp-fullscreen btn widget' // This overwrites all classes on the container!
         });
 
         editor.addMenuItem( 'wp_fullscreen', {