WordPress 4.2

[autoinstalls/wordpress.git] / wp-includes / class.wp-styles.php

diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index ecc0bb9e22c50f322770f27316d3cd0af2cb4830..46cb913bd3541ecfa8fd4a40cab4815f696a577c 100644 (file)
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -17,102 +17,213 @@
  * @since r74
  */
 class WP_Styles extends WP_Dependencies {
  * @since r74
  */
 class WP_Styles extends WP_Dependencies {

-       var $base_url;
-       var $content_url;
-       var $default_version;
-       var $text_direction = 'ltr';
-       var $concat = '';
-       var $concat_version = '';
-       var $do_concat = false;
-       var $print_html = '';
-       var $default_dirs;
-
-       function __construct() {
+       public $base_url;
+       public $content_url;
+       public $default_version;
+       public $text_direction = 'ltr';
+       public $concat = '';
+       public $concat_version = '';
+       public $do_concat = false;
+       public $print_html = '';
+       public $print_code = '';
+       public $default_dirs;
+
+       public function __construct() {
+               /**
+                * Fires when the WP_Styles instance is initialized.
+                *
+                * @since 2.6.0
+                *
+                * @param WP_Styles &$this WP_Styles instance, passed by reference.
+                */

                do_action_ref_array( 'wp_default_styles', array(&$this) );
        }
 
                do_action_ref_array( 'wp_default_styles', array(&$this) );
        }
 

-       function do_item( $handle ) {
+       /**
+        * @param string $handle
+        * @return bool
+        */
+       public function do_item( $handle ) {

                if ( !parent::do_item($handle) )
                        return false;
 
                if ( !parent::do_item($handle) )
                        return false;
 

-               if ( null === $this->registered[$handle]->ver )
+               $obj = $this->registered[$handle];
+               if ( null === $obj->ver )

                        $ver = '';
                else
                        $ver = '';
                else

-                       $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+                       $ver = $obj->ver ? $obj->ver : $this->default_version;

 
                if ( isset($this->args[$handle]) )
                        $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
 
                if ( $this->do_concat ) {
 
                if ( isset($this->args[$handle]) )
                        $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
 
                if ( $this->do_concat ) {

-                       if ( $this->in_default_dir($this->registered[$handle]->src) && !isset($this->registered[$handle]->extra['conditional']) && !isset($this->registered[$handle]->extra['alt']) ) {
+                       if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {

                                $this->concat .= "$handle,";
                                $this->concat_version .= "$handle$ver";
                                $this->concat .= "$handle,";
                                $this->concat_version .= "$handle$ver";

+
+                               $this->print_code .= $this->print_inline_style( $handle, false );
+

                                return true;
                        }
                }
 
                                return true;
                        }
                }
 

-               if ( isset($this->registered[$handle]->args) )
-                       $media = esc_attr( $this->registered[$handle]->args );
+               if ( isset($obj->args) )
+                       $media = esc_attr( $obj->args );

                else
                        $media = 'all';
 
                else
                        $media = 'all';
 

-               $href = $this->_css_href( $this->registered[$handle]->src, $ver, $handle );
-               $rel = isset($this->registered[$handle]->extra['alt']) && $this->registered[$handle]->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-               $title = isset($this->registered[$handle]->extra['title']) ? "title='" . esc_attr( $this->registered[$handle]->extra['title'] ) . "'" : '';
-
-               $end_cond = $tag = '';
-               if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) {
-                       $tag .= "<!--[if {$this->registered[$handle]->extra['conditional']}]>\n";
-                       $end_cond = "<![endif]-->\n";
+               $href = $this->_css_href( $obj->src, $ver, $handle );
+               if ( empty( $href ) ) {
+                       // Turns out there is nothing to print.
+                       return true;

                }
                }

-
-               $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'] ) ) {
-                               $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" ));
+               $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
+               $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+
+               /**
+                * Filter the HTML link tag of an enqueued style.
+                *
+                * @since 2.6.0
+                *
+                * @param string         The link tag for the enqueued style.
+                * @param string $handle The style's registered handle.
+                */
+               $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($obj->extra['rtl']) && $obj->extra['rtl'] ) {
+                       if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
+                               $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+                               $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));

                        } else {
                        } else {

-                               $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" );
+                               $rtl_href = $this->_css_href( $obj->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 );
+                       /** This filter is documented in wp-includes/class.wp-styles.php */
+                       $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 );
+
+                       if ( $obj->extra['rtl'] === 'replace' ) {
+                               $tag = $rtl_tag;
+                       } else {
+                               $tag .= $rtl_tag;
+                       }

                }
 
                }
 

-               $tag .= $end_cond;
+               $conditional_pre = $conditional_post = '';
+               if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+                       $conditional_pre  = "<!--[if {$obj->extra['conditional']}]>\n";
+                       $conditional_post = "<![endif]-->\n";
+               }

 
 

-               if ( $this->do_concat )
+               if ( $this->do_concat ) {
+                       $this->print_html .= $conditional_pre;

                        $this->print_html .= $tag;
                        $this->print_html .= $tag;

-               else
+                       if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
+                               $this->print_html .= sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+                       }
+                       $this->print_html .= $conditional_post;
+               } else {
+                       echo $conditional_pre;

                        echo $tag;
                        echo $tag;

+                       $this->print_inline_style( $handle );
+                       echo $conditional_post;
+               }
+
+               return true;
+       }
+
+       /**
+        * @param string $handle
+        * @param string $code
+        */
+       public function add_inline_style( $handle, $code ) {
+               if ( ! $code ) {
+                       return false;
+               }
+
+               $after = $this->get_data( $handle, 'after' );
+               if ( ! $after ) {
+                       $after = array();
+               }
+
+               $after[] = $code;
+
+               return $this->add_data( $handle, 'after', $after );
+       }
+
+       /**
+        * @param string $handle
+        * @param bool $echo
+        * @return bool
+        */
+       public function print_inline_style( $handle, $echo = true ) {
+               $output = $this->get_data( $handle, 'after' );
+
+               if ( empty( $output ) ) {
+                       return false;
+               }
+
+               $output = implode( "\n", $output );

 
 

-               // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
-//             echo "<style type='text/css'>\n";
-//             echo "/* <![CDATA[ */\n";
-//             echo "/* ]]> */\n";
-//             echo "</style>\n";
+               if ( ! $echo ) {
+                       return $output;
+               }
+
+               printf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $output );

 
                return true;
        }
 
 
                return true;
        }
 

-       function all_deps( $handles, $recursion = false, $group = false ) {
+       /**
+        * @param mixed $handles
+        * @param bool $recursion
+        * @param mixed $group
+        * @return bool
+        */
+       public function all_deps( $handles, $recursion = false, $group = false ) {

                $r = parent::all_deps( $handles, $recursion );
                $r = parent::all_deps( $handles, $recursion );

-               if ( !$recursion )
+               if ( !$recursion ) {
+                       /**
+                        * Filter the array of enqueued styles before processing for output.
+                        *
+                        * @since 2.6.0
+                        *
+                        * @param array $to_do The list of enqueued styles about to be processed.
+                        */

                        $this->to_do = apply_filters( 'print_styles_array', $this->to_do );
                        $this->to_do = apply_filters( 'print_styles_array', $this->to_do );

+               }

                return $r;
        }
 
                return $r;
        }
 

-       function _css_href( $src, $ver, $handle ) {
-               if ( !is_bool($src) && !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+       /**
+        * @param string $src
+        * @param string $ver
+        * @param string $handle
+        * @return string
+        */
+       public function _css_href( $src, $ver, $handle ) {
+               if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {

                        $src = $this->base_url . $src;
                }
 
                if ( !empty($ver) )
                        $src = add_query_arg('ver', $ver, $src);
                        $src = $this->base_url . $src;
                }
 
                if ( !empty($ver) )
                        $src = add_query_arg('ver', $ver, $src);

+
+               /**
+                * Filter an enqueued style's fully-qualified URL.
+                *
+                * @since 2.6.0
+                *
+                * @param string $src    The source URL of the enqueued style.
+                * @param string $handle The style's registered handle.
+                */

                $src = apply_filters( 'style_loader_src', $src, $handle );
                return esc_url( $src );
        }
 
                $src = apply_filters( 'style_loader_src', $src, $handle );
                return esc_url( $src );
        }
 

-       function in_default_dir($src) {
+       /**
+        * @param string $src
+        * @return bool
+        */
+       public function in_default_dir($src) {

                if ( ! $this->default_dirs )
                        return true;
 
                if ( ! $this->default_dirs )
                        return true;
 


@@ -123,4 +234,15 @@ class WP_Styles extends WP_Dependencies {
                return false;
        }
 
                return false;
        }
 

+       public function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
+               $this->do_items(false, 1);
+               return $this->done;
+       }
+
+       public function reset() {
+               $this->do_concat = false;
+               $this->concat = '';
+               $this->concat_version = '';
+               $this->print_html = '';
+       }

 }
 }