Changeset 30573

Timestamp:

11/26/2014 02:49:41 AM (12 years ago)

Author:

azaozz

Message:

Editor:

• Add CSS reset for the TinyMCE fullscreen mode when used on the Edit Post screen.
• Fix loading of the old and new DFW buttons, use another arg. passed to WP_Editors.
• Reset editor-expand when exiting TinyMCE fullscreen mode.

Fixes #30453.

Location:

trunk/src

Files:

• wp-admin/css/edit.css (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (3 diffs)
• wp-admin/js/editor-expand.js (modified) (6 diffs)
• wp-includes/class-wp-editor.php (modified) (3 diffs)
• wp-includes/css/editor.css (modified) (1 diff)
• wp-includes/js/quicktags.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js (modified) (1 diff)

trunk/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 {

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

@@ -12 +12 @@
 
 wp_enqueue_script('post');
-$_wp_editor_expand = false;
+$_wp_editor_expand = $_content_editor_dfw = false;
 
 /**
@@ -26 +26 @@
 
         wp_enqueue_script('editor-expand');
+        $_content_editor_dfw = true;
         $_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
 }
@@ -513 +514 @@
 
 <?php wp_editor( $post->post_content, 'content', array(
+        '_content_editor_dfw' => $_content_editor_dfw,
         'drag_drop_upload' => true,
         'tabfocus_elements' => 'content-html,save-post',

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

@@ -243 +243 @@
                         }
 
+                        function mceFullscreenToggled( event ) {
+                                if ( ! event.state ) {
+                                        adjust();
+                                }
+                        }
+
                         // Adjust when switching editor modes.
                         function mceShow() {
@@ -281 +287 @@
                                 // 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 );
@@ -294 +302 @@
                                 editor.off( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
                                 editor.off( 'undo redo', mceScroll );
+                                editor.off( 'FullscreenStateChanged', mceFullscreenToggled );
 
                                 $window.off( 'scroll.mce-float-panels' );
@@ -766 +775 @@
                         $editorIframe = $(),
                         _isActive = window.getUserSetting( 'editor_expand', 'on' ) === 'on',
-                        _isOn = _isActive ? !! parseInt( window.getUserSetting( 'dfw', '1' ), 10 ) : false,
+                        _isOn = _isActive ? window.getUserSetting( 'post_dfw' ) === 'on' : false,
                         traveledX = 0,
                         traveledY = 0,
@@ -826 +835 @@
                                 fadeOut();
 
-                                window.setUserSetting( 'dfw', '1' );
+                                window.setUserSetting( 'post_dfw', 'on' );
 
                                 $document.trigger( 'dfw-on' );
@@ -842 +851 @@
                                 $editor.off( '.focus' );
 
-                                window.setUserSetting( 'dfw', '0' );
+                                window.setUserSetting( 'post_dfw', 'off' );
 
                                 $document.trigger( 'dfw-off' );

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

@@ -184 +184 @@
                 $wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
 
-                if ( $set['dfw'] ) {
+                if ( $set['_content_editor_dfw'] ) {
                         $wrap_class .= ' has-dfw';
                 }
@@ -279 +279 @@
                                 $qtInit['buttons'] .= ',fullscreen';
 
-                        if ( $editor_id === 'content' && ! wp_is_mobile() )
+                        if ( $set['_content_editor_dfw'] ) {
                                 $qtInit['buttons'] .= ',dfw';
+                        }
 
                         /**
@@ -550 +551 @@
                                 $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' );
-
-                                if ( $editor_id ) {
+                                $mce_buttons = array( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+
+                                if ( $set['_content_editor_dfw'] ) {
                                         $mce_buttons[] = 'dfw';
                                 } else {
                                         $mce_buttons[] = 'fullscreen';
                                 }
+
+                                $mce_buttons[] = 'wp_adv';
 
                                 /**

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

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

trunk/src/wp-includes/js/quicktags.js

@@ -302 +302 @@
                         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;
@@ -417 +419 @@
 
                 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"';

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

@@ -66 +66 @@
                 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!
         });