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

Timestamp:

12/13/2018 05:26:09 PM (8 years ago)

Author:

desrosj

Message:

Script loader: Adjust JS packages registration.

Adjusts the packages registration after [43723]:

Combine the different registration functions into one wp_default_packages function. To reach this goal move the prefix logic into a function so it can be called from different locations. Use a static variable there to prevent duplicate inclusion of version.php.

Call this function from the wp_default_scripts action by registering it as a default filter.

Combine some of the logic in _WP_Editors::print_tinymce_scripts into wp_register_tinymce_scripts. The logic to force an uncompressed TinyMCE script file stays in _WP_Editors::force_uncompressed_tinymce because that logic is very specific to the classic editor.

The script handle wp-tinymce is now a dependency of the editor script handle. In combination with the previous item, this makes the classic editor work.

Adjust the syntax of the script paths to be more consistent with other WordPress code.

Always use "production" mode for the media files to prevent people from inadvertently committing development files.

Props pento, omarreiss, atimmer.

Merges [43738] into trunk.

Fixes #45065.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (6 diffs)

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

@@ -318 +318 @@
                         if ( is_admin() ) {
                                 add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+                                add_action( 'admin_print_footer_scripts', array( __CLASS__, 'force_uncompressed_tinymce' ), 1 );
                                 add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
                         } else {
                                 add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
+                                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'force_uncompressed_tinymce' ), 1 );
                                 add_action( 'wp_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
                         }
@@ -756 +758 @@
 
         /**
+         *
+         * @static
+         *
          * @param bool $default_scripts Optional. Whether default scripts should be enqueued. Default false.
          */
@@ -820 +825 @@
 
                 if ( is_admin() ) {
+                        add_action( 'admin_print_footer_scripts', array( __CLASS__, 'force_uncompressed_tinymce' ), 1 );
                         add_action( 'admin_print_footer_scripts', array( __CLASS__, 'print_default_editor_scripts' ), 45 );
                 } else {
+                        add_action( 'wp_print_footer_scripts', array( __CLASS__, 'force_uncompressed_tinymce' ), 1 );
                         add_action( 'wp_print_footer_scripts', array( __CLASS__, 'print_default_editor_scripts' ), 45 );
                 }
@@ -1389 +1396 @@
 
         /**
+         * Force uncompressed TinyMCE when a custom theme has been defined.
+         *
+         * The compressed TinyMCE file cannot deal with custom themes, so this makes
+         * sure that we use the uncompressed TinyMCE file if a theme is defined.
+         * Even if we are on a production environment.
+         */
+        public static function force_uncompressed_tinymce() {
+                $has_custom_theme = false;
+                foreach ( self::$mce_settings as $init ) {
+                        if ( ! empty( $init['theme_url'] ) ) {
+                                $has_custom_theme = true;
+                                break;
+                        }
+                }
+
+                if ( ! $has_custom_theme ) {
+                        return;
+                }
+
+                $wp_scripts = wp_scripts();
+
+                $wp_scripts->remove( 'wp-tinymce' );
+                wp_register_tinymce_scripts( $wp_scripts, true );
+        }
+
+        /**
          * Print (output) the main TinyMCE scripts.
          *
@@ -1398 +1431 @@
          */
         public static function print_tinymce_scripts() {
-                global $tinymce_version, $concatenate_scripts, $compress_scripts;
+                global $concatenate_scripts;
 
                 if ( self::$tinymce_scripts_printed ) {
@@ -1409 +1442 @@
                         script_concat_settings();
                 }
-
-                $suffix  = SCRIPT_DEBUG ? '' : '.min';
-                $version = 'ver=' . $tinymce_version;
-                $baseurl = self::get_baseurl();
-
-                $has_custom_theme = false;
-                foreach ( self::$mce_settings as $init ) {
-                        if ( ! empty( $init['theme_url'] ) ) {
-                                $has_custom_theme = true;
-                                break;
-                        }
-                }
-
-                $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
-                        && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $has_custom_theme;
-
-                // Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
-                $mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
-
-                if ( $compressed ) {
-                        echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
-                } else {
-                        echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
-                        echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
-                }
-
-                echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
         }