Changeset 41067

Timestamp:

07/18/2017 01:54:14 AM (7 years ago)

Author:

westonruter

Message:

TinyMCE: respect the Disable the visual editor when writing user setting and don't output the TinyMCE components when using wp_enqueue_editor().

Merges [40991] onto 4.8 branch.
Props azaozz.
Fixes #40960 for 4.8.1.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-admin/js/widgets/text-widgets.js (modified) (1 diff)
• src/wp-includes/class-wp-editor.php (modified) (2 diffs)

branches/4.8/src/wp-admin/js/widgets/text-widgets.js

@@ -179 +179 @@
                 // Abort building if the textarea is gone, likely due to the widget having been deleted entirely.
                 if ( ! document.getElementById( id ) ) {
+                    return;
+                }
+
+                // The user has disabled TinyMCE.
+                if ( typeof window.tinymce === 'undefined' ) {
+                    wp.editor.initialize( id, {
+                        quicktags: true
+                    });
+
                     return;
                 }

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

@@ -820 +820 @@
      */
     public static function print_default_editor_scripts() {
-        $settings = self::default_settings();
-
-        $settings['toolbar1'] = 'bold,italic,bullist,numlist,link';
-        $settings['wpautop'] = false;
-        $settings['indent'] = true;
-        $settings['elementpath'] = false;
-
-        if ( is_rtl() ) {
-            $settings['directionality'] = 'rtl';
-        }
-
-        // In production all plugins are loaded (they are in wp-editor.js.gz)
-        // but only these will be initialized by default.
-        $settings['plugins'] = implode( ',', array(
-            'charmap',
-            'colorpicker',
-            'hr',
-            'lists',
-    //      'media',
-            'paste',
-            'tabfocus',
-            'textcolor',
-            'fullscreen',
-            'wordpress',
-            'wpautoresize',
-            'wpeditimage',
-            'wpemoji',
-            'wpgallery',
-            'wplink',
-    //      'wpdialogs',
-            'wptextpattern',
-    //      'wpview',
-        ) );
-
-        $settings = self::_parse_init( $settings );
-
-        $suffix = SCRIPT_DEBUG ? '' : '.min';
-        $baseurl = self::get_baseurl();
+        $user_can_richedit = user_can_richedit();
+
+        if ( $user_can_richedit ) {
+            $settings = self::default_settings();
+
+            $settings['toolbar1'] = 'bold,italic,bullist,numlist,link';
+            $settings['wpautop'] = false;
+            $settings['indent'] = true;
+            $settings['elementpath'] = false;
+
+            if ( is_rtl() ) {
+                $settings['directionality'] = 'rtl';
+            }
+
+            // In production all plugins are loaded (they are in wp-editor.js.gz).
+            // The 'wpview', 'wpdialogs', and 'media' TinyMCE plugins are not initialized by default.
+            // Can be added from js by using the 'wp-before-tinymce-init' event.
+            $settings['plugins'] = implode( ',', array(
+                'charmap',
+                'colorpicker',
+                'hr',
+                'lists',
+                'paste',
+                'tabfocus',
+                'textcolor',
+                'fullscreen',
+                'wordpress',
+                'wpautoresize',
+                'wpeditimage',
+                'wpemoji',
+                'wpgallery',
+                'wplink',
+                'wptextpattern',
+            ) );
+
+            $settings = self::_parse_init( $settings );
+        } else {
+            $settings = '{}';
+        }
 
         ?>
@@ -872 +873 @@
         };
 
-        var tinyMCEPreInit = {
-            baseURL: "<?php echo $baseurl; ?>",
-            suffix: "<?php echo $suffix; ?>",
-            mceInit: {},
-            qtInit: {},
-            load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
-        };
+        <?php
+
+        if ( $user_can_richedit ) {
+            $suffix = SCRIPT_DEBUG ? '' : '.min';
+            $baseurl = self::get_baseurl();
+
+            ?>
+            var tinyMCEPreInit = {
+                baseURL: "<?php echo $baseurl; ?>",
+                suffix: "<?php echo $suffix; ?>",
+                mceInit: {},
+                qtInit: {},
+                load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
+            };
+            <?php
+        }
+        ?>
         </script>
         <?php
 
-        self::print_tinymce_scripts();
+        if ( $user_can_richedit ) {
+            self::print_tinymce_scripts();
+        }
 
         /**