Changeset 30573 for trunk/src/wp-includes/class-wp-editor.php

Timestamp:

11/26/2014 02:49:41 AM (10 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.

File:

• trunk/src/wp-includes/class-wp-editor.php (modified) (3 diffs)

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';
 
                 /**