Changeset 36341 for trunk/src/wp-includes/script-loader.php

Timestamp:

01/18/2016 09:56:06 AM (9 years ago)

Author:

dd32

Message:

CSS: Stop using wp-admin.min.css and instead queue the individual stylesheets up through load-styles.php.
We still generate the wp-admin.* files for compabitility purposes, however they only include the @import() lines.

Fixes #35229

File:

• trunk/src/wp-includes/script-loader.php (modified) (5 diffs)

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

@@ -719 +719 @@
 
     // Admin CSS
-    $styles->add( 'wp-admin',            "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
-    $styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) );
+    $styles->add( 'common',              "/wp-admin/css/common$suffix.css" );
+    $styles->add( 'forms',               "/wp-admin/css/forms$suffix.css" );
+    $styles->add( 'admin-menu',          "/wp-admin/css/admin-menu$suffix.css" );
+    $styles->add( 'dashboard',           "/wp-admin/css/dashboard$suffix.css" );
+    $styles->add( 'list-tables',         "/wp-admin/css/list-tables$suffix.css" );
+    $styles->add( 'edit',                "/wp-admin/css/edit$suffix.css" );
+    $styles->add( 'revisions',           "/wp-admin/css/revisions$suffix.css" );
+    $styles->add( 'media',               "/wp-admin/css/media$suffix.css" );
+    $styles->add( 'themes',              "/wp-admin/css/themes$suffix.css" );
+    $styles->add( 'about',               "/wp-admin/css/about$suffix.css" );
+    $styles->add( 'nav-menus',           "/wp-admin/css/nav-menus$suffix.css" );
+    $styles->add( 'widgets',             "/wp-admin/css/widgets$suffix.css" );
+    $styles->add( 'site-icon',           "/wp-admin/css/site-icon$suffix.css" );
+    $styles->add( 'l10n',                "/wp-admin/css/l10n$suffix.css" );
+
+    $styles->add( 'wp-admin', false, array( 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n', 'open-sans', 'dashicons' ) );
+
+    $styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'buttons', 'forms', 'l10n', 'open-sans', 'dashicons' ) );
     $styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
     $styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
@@ -762 +778 @@
     $rtl_styles = array(
         // wp-admin
-        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'ie', 'login', 'press-this',
+        'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus',
+        'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus',
+        'ie', 'login', 'press-this',
         // wp-includes
         'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
@@ -1101 +1119 @@
     }
 
+    script_concat_settings();
     $wp_styles->do_concat = $concatenate_scripts;
     $wp_styles->do_footer_items();
@@ -1135 +1154 @@
         $zip = 'gzip';
 
-    if ( !empty($wp_styles->concat) ) {
+    if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
         $dir = $wp_styles->text_direction;
         $ver = $wp_styles->default_version;
-        $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . '&ver=' . $ver;
+
+        $concat = str_split( $concat, 128 );
+        $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+
+        $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
         echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
 
@@ -1168 +1191 @@
     if ( ! isset($concatenate_scripts) ) {
         $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-        if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+        if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
             $concatenate_scripts = false;
     }