<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26780] trunk/src/wp-includes: Admin color schemes: Manually handle RTL and minified versions of the CSS files on registration.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26780">26780</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-12-07 09:04:02 +0000 (Sat, 07 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Admin color schemes: Manually handle RTL and minified versions of the CSS files on registration.
This bypasses WP_Styles entirely, which is much simpler for the moment, given that color schemes bypass WP_Styles for plenty already. The script loader is told to stop thinking of colors.css as an RTL-ified file. The colors-fresh handle, used directly on the login screen, needed to be (even before this commit).
fixes <a href="http://core.trac.wordpress.org/ticket/26316">#26316</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/general-template.php (26779 => 26780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2013-12-07 08:06:23 UTC (rev 26779)
+++ trunk/src/wp-includes/general-template.php 2013-12-07 09:04:02 UTC (rev 26780)
</span><span class="lines">@@ -2115,8 +2115,11 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function register_admin_color_schemes() {
</span><ins>+ $suffix = is_rtl() ? '-rtl' : '';
+ $suffix .= SCRIPT_DEBUG ? '' : '.min';
+
</ins><span class="cx"> wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors.min.css' ),
</del><ins>+ admin_url( "css/colors$suffix.css" ),
</ins><span class="cx"> array( '#222', '#333', '#0074a2', '#2ea2cc' ),
</span><span class="cx"> array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' )
</span><span class="cx"> );
</span><span class="lines">@@ -2126,43 +2129,43 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/light/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/light/colors$suffix.css" ),
</ins><span class="cx"> array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
</span><span class="cx"> array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/blue/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/blue/colors$suffix.css" ),
</ins><span class="cx"> array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
</span><span class="cx"> array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/midnight/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/midnight/colors$suffix.css" ),
</ins><span class="cx"> array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
</span><span class="cx"> array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/sunrise/colors.min.css' ),
- array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
</del><ins>+ admin_url( "css/colors/sunrise/colors$suffix.css" ),
+ array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
</ins><span class="cx"> array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/ectoplasm/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
</ins><span class="cx"> array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
</span><span class="cx"> array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/ocean/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/ocean/colors$suffix.css" ),
</ins><span class="cx"> array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
</span><span class="cx"> array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
</span><del>- admin_url( 'css/colors/coffee/colors.min.css' ),
</del><ins>+ admin_url( "css/colors/coffee/colors$suffix.css" ),
</ins><span class="cx"> array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
</span><span class="cx"> array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (26779 => 26780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2013-12-07 08:06:23 UTC (rev 26779)
+++ trunk/src/wp-includes/script-loader.php 2013-12-07 09:04:02 UTC (rev 26780)
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx">
</span><span class="cx"> $suffix = SCRIPT_DEBUG ? '' : '.min';
</span><span class="cx">
</span><del>- $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install', 'colors' );
</del><ins>+ $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install' );
</ins><span class="cx">
</span><span class="cx"> $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
</span><span class="cx">
</span><span class="lines">@@ -699,9 +699,6 @@
</span><span class="cx"> $parsed = parse_url( $src );
</span><span class="cx"> $url = $color->url;
</span><span class="cx">
</span><del>- if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG )
- $url = preg_replace( '/.min.css$|.min.css(?=\?)/', '.css', $url );
-
</del><span class="cx"> if ( isset($parsed['query']) && $parsed['query'] ) {
</span><span class="cx"> wp_parse_str( $parsed['query'], $qv );
</span><span class="cx"> $url = add_query_arg( $qv, $url );
</span></span></pre>
</div>
</div>
</body>
</html>