Ticket #21976: 21976.patch

wp-includes/class-wp-editor.php

@@ -167 +167 @@
                                 self::$baseurl = includes_url('js/tinymce');
                                 self::$mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
                                 $no_captions = (bool) apply_filters( 'disable_captions', '' );
-                                $plugins = array( 'inlinepopups', 'spellchecker', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
                                 $first_run = true;
                                 $ext_plugins = '';
+                                $plugins = array( 'inlinepopups', 'spellchecker', 'tabfocus', 'paste', 'media', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
 
+                                if ( $set['dfw'] )
+                                        $plugins[] = 'wpfullscreen';
+
                                 if ( $set['teeny'] ) {
                                         self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs'), $editor_id );
                                 } else {
@@ -254 +257 @@
                                         $plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
                                 }
 
-                                if ( $set['dfw'] )
-                                        $plugins[] = 'wpfullscreen';
-
                                 self::$plugins = $plugins;
                                 self::$ext_plugins = $ext_plugins;
 
@@ -362 +362 @@
                                 $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'separator', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
                                 $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
                         } else {
-                                $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id);
+                                $mce_buttons = array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'wp_adv' );
+
+                                if ( $set['dfw'] )
+                                        array_splice($mce_buttons, -1, 0, 'wp_fullscreen');
+
+                                $mce_buttons = apply_filters('mce_buttons', $mce_buttons, $editor_id);
                                 $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ), $editor_id);
                                 $mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
                                 $mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
@@ -378 +383 @@
                                 unset($set['tinymce']['body_class']);
                         }
 
-                        if ( $set['dfw'] ) {
-                                // replace the first 'fullscreen' with 'wp_fullscreen'
-                                if ( ($key = array_search('fullscreen', $mce_buttons)) !== false )
-                                        $mce_buttons[$key] = 'wp_fullscreen';
-                                elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
-                                        $mce_buttons_2[$key] = 'wp_fullscreen';
-                                elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
-                                        $mce_buttons_3[$key] = 'wp_fullscreen';
-                                elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
-                                        $mce_buttons_4[$key] = 'wp_fullscreen';
-                        }
-
                         $mceInit = array (
                                 'elements' => $editor_id,
                                 'wpautop' => (bool) $set['wpautop'],

wp-includes/js/tinymce/langs/wp-langs-en.js

@@ -170 +170 @@
 unload_msg:"The changes you made will be lost if you navigate away from this page."
 },
 fullscreen:{
-desc:"Toggle fullscreen mode (Alt + Shift + G)"
+desc:"Toggle fullscreen mode"
 },
 media:{
 desc:"Insert / edit embedded media",

wp-includes/js/tinymce/langs/wp-langs.php

@@ -207 +207 @@
                 ),
 
                 'fullscreen' => array(
-                        'desc' => __('Toggle fullscreen mode (Alt + Shift + G)')
+                        'desc' => __('Toggle fullscreen mode')
                 ),
 
                 'media' => array(

wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -272 +272 @@
                         ed.addShortcut(mod_key + '+p', 'wordpress.wp_page_desc', 'WP_Page');
                         ed.addShortcut('ctrl+s', 'save_desc', function(){if('function'==typeof autosave)autosave();});
 
-                        if ( /\bwpfullscreen\b/.test(ed.settings.plugins) )
+                        if ( /\bwpfullscreen\b/.test(ed.settings.plugins) && ed.id != 'mce_fullscreen' )
                                 ed.addShortcut(mod_key + '+w', 'wordpress.wp_fullscreen_desc', 'wpFullScreen');
-                        else if ( /\bfullscreen\b/.test(ed.settings.plugins) )
-                                ed.addShortcut(mod_key + '+g', 'fullscreen.desc', 'mceFullScreen');
 
                         // popup buttons for images and the gallery
                         ed.onInit.add(function(ed) {

wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js

@@ -94 +94 @@
                         });
 
                         ed.addCommand('wpFullScreen', function() {
-                                if ( typeof(fullscreen) == 'undefined' )
+                                if ( typeof(fullscreen) == 'undefined' || tinymce.get('mce_fullscreen') ) // don't open DFW if the TInyMCE fullscreen is currently open
                                         return;
 
                                 if ( 'wp_mce_fullscreen' == ed.id )