Changeset 13351

Timestamp:

02/23/2010 11:46:07 PM (16 years ago)

Author:

nacin

Message:

Proper RTL + .dev.css support, first pass. See #12292

Location:

trunk/wp-includes

Files:

• class.wp-styles.php (modified) (1 diff)
• script-loader.php (modified) (2 diffs)

trunk/wp-includes/class.wp-styles.php

@@ -69 +69 @@
                 $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle );
                 if ( 'rtl' === $this->text_direction && isset($this->registered[$handle]->extra['rtl']) && $this->registered[$handle]->extra['rtl'] ) {
-                        if ( is_bool( $this->registered[$handle]->extra['rtl'] ) )
-                                $rtl_href = str_replace( '.css', '-rtl.css', $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" ));
-                        else
+                        if ( is_bool( $this->registered[$handle]->extra['rtl'] ) ) {
+                                $suffix = isset( $this->registered[$handle]->extra['suffix'] ) ? $this->registered[$handle]->extra['suffix'] : '';
+                                $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" ));
+                        } else {
                                 $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" );
+                        }
 
                         $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle );

trunk/wp-includes/script-loader.php

@@ -434 +434 @@
 
         $rtl_styles = array( 'wp-admin', 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
+        // Any rtl stylesheets that don't have a .dev version for ltr
+        $no_suffix = array( 'farbtastic' );
 
         // all colors stylesheets need to have the same query strings (cache manifest compat)
@@ -469 +471 @@
         $styles->add( 'custom-navigation', "/wp-admin/css/custom-navigation$suffix.css", array(), '20100215' );
 
-        foreach ( $rtl_styles as $rtl_style )
+        foreach ( $rtl_styles as $rtl_style ) {
                 $styles->add_data( $rtl_style, 'rtl', true );
+                if ( $suffix && ! in_array( $rtl_style, $no_suffix ) )
+                        $styles->add_data( $rtl_style, 'suffix', $suffix );
+        }
 }