Changeset 44314 for trunk

Timestamp:

12/18/2018 11:24:07 PM (8 years ago)

Author:

desrosj

Message:

Script Loader: Pass the suffix to package style handles to ensure correct file names for minified RTL stylesheets.

Props ocean90.

Merges [44231] into trunk.

See #45547.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -1922 +1922 @@
         $styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
 
+        // Packages styles
+        $fonts_url = '';
+
+        /*
+         * Translators: Use this to specify the proper Google Font name and variants
+         * to load that is supported by your language. Do not translate.
+         * Set to 'off' to disable loading.
+         */
+        $font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
+        if ( 'off' !== $font_family ) {
+                $fonts_url = 'https://fonts.googleapis.com/css?family=' . urlencode( $font_family );
+        }
+        $styles->add( 'wp-editor-font', $fonts_url );
+
+        $styles->add( 'wp-block-library-theme', "/wp-includes/css/dist/block-library/theme$suffix.css" );
+
+        $styles->add(
+                'wp-edit-blocks',
+                "/wp-includes/css/dist/block-library/editor$suffix.css",
+                array(
+                        'wp-components',
+                        'wp-editor',
+                        'wp-block-library',
+                        // Always include visual styles so the editor never appears broken.
+                        'wp-block-library-theme',
+                )
+        );
+
+        $package_styles = array(
+                'block-library'        => array(),
+                'components'           => array(),
+                'edit-post'            => array( 'wp-components', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-nux' ),
+                'editor'               => array( 'wp-components', 'wp-editor-font', 'wp-nux' ),
+                'format-library'       => array(),
+                'list-reusable-blocks' => array( 'wp-components' ),
+                'nux'                  => array( 'wp-components' ),
+        );
+
+        foreach ( $package_styles as $package => $dependencies ) {
+                $handle = 'wp-' . $package;
+                $path   = "/wp-includes/css/dist/$package/style$suffix.css";
+
+                $styles->add( $handle, $path, $dependencies );
+        }
+
         // RTL CSS
         $rtl_styles = array(
-                // wp-admin
+                // Admin CSS
                 'common',
                 'forms',
@@ -1947 +1992 @@
                 'ie',
                 'login',
-                // wp-includes
+                // Includes CSS
                 'buttons',
                 'admin-bar',
@@ -1955 +2000 @@
                 'wp-pointer',
                 'wp-jquery-ui-dialog',
-                // deprecated
+                // Package styles
+                'wp-block-library-theme',
+                'wp-edit-blocks',
+                'wp-block-library',
+                'wp-components',
+                'wp-edit-post',
+                'wp-editor',
+                'wp-format-library',
+                'wp-list-reusable-blocks',
+                'wp-nux',
+                // Deprecated CSS
                 'deprecated-media',
                 'farbtastic',
@@ -1965 +2020 @@
                         $styles->add_data( $rtl_style, 'suffix', $suffix );
                 }
-        }
-
-        // Packages styles
-        $fonts_url = '';
-
-        /*
-         * Translators: Use this to specify the proper Google Font name and variants
-         * to load that is supported by your language. Do not translate.
-         * Set to 'off' to disable loading.
-         */
-        $font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
-        if ( 'off' !== $font_family ) {
-                $fonts_url = 'https://fonts.googleapis.com/css?family=' . urlencode( $font_family );
-        }
-        $styles->add( 'wp-editor-font', $fonts_url );
-
-        $styles->add( 'wp-block-library-theme', "/wp-includes/css/dist/block-library/theme$suffix.css" );
-        $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' );
-
-        $styles->add(
-                'wp-edit-blocks',
-                "/wp-includes/css/dist/block-library/editor$suffix.css",
-                array(
-                        'wp-components',
-                        'wp-editor',
-                        'wp-block-library',
-                        // Always include visual styles so the editor never appears broken.
-                        'wp-block-library-theme',
-                )
-        );
-        $styles->add_data( 'wp-edit-blocks', 'rtl', 'replace' );
-
-        $package_styles = array(
-                'block-library'        => array(),
-                'components'           => array(),
-                'edit-post'            => array( 'wp-components', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-nux' ),
-                'editor'               => array( 'wp-components', 'wp-editor-font', 'wp-nux' ),
-                'format-library'       => array(),
-                'list-reusable-blocks' => array( 'wp-components' ),
-                'nux'                  => array( 'wp-components' ),
-        );
-
-        foreach ( $package_styles as $package => $dependencies ) {
-                $handle = 'wp-' . $package;
-                $path   = "/wp-includes/css/dist/$package/style$suffix.css";
-
-                $styles->add( $handle, $path, $dependencies );
-                $styles->add_data( $handle, 'rtl', 'replace' );
         }
 }