Changeset 10367

Timestamp:

01/15/2009 07:50:23 PM (16 years ago)

Author:

azaozz

Message:

Let plugins register footer scripts easier and add filters to the concatenating functions

Location:

trunk/wp-includes

Files:

• class.wp-scripts.php (modified) (2 diffs)
• functions.wp-scripts.php (modified) (4 diffs)
• script-loader.php (modified) (5 diffs)

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

@@ -27 +27 @@
     var $print_html = '';
     var $print_code = '';
+    var $src = '';
     var $default_dirs;
 
@@ -110 +111 @@
         }
 
+        $this->src .= "$src,";
         $src = add_query_arg('ver', $ver, $src);
         $src = clean_url(apply_filters( 'script_loader_src', $src, $handle ));

trunk/wp-includes/functions.wp-scripts.php

@@ -41 +41 @@
  * @see WP_Scripts::add() For parameter information.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false ) {
+function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
     global $wp_scripts;
     if ( !is_a($wp_scripts, 'WP_Scripts') )
@@ -47 +47 @@
 
     $wp_scripts->add( $handle, $src, $deps, $ver );
+    if ( $in_footer )
+        $wp_scripts->add_data( $handle, 'group', 1 );
 }
 
@@ -87 +89 @@
  * @see WP_Script::add(), WP_Script::enqueue()
 */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false ) {
+function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
     global $wp_scripts;
     if ( !is_a($wp_scripts, 'WP_Scripts') )
@@ -95 +97 @@
         $_handle = explode('?', $handle);
         $wp_scripts->add( $_handle[0], $src, $deps, $ver );
+        if ( $in_footer )
+            $wp_scripts->add_data( $_handle[0], 'group', 1 );
     }
     $wp_scripts->enqueue( $handle );

trunk/wp-includes/script-loader.php

@@ -537 +537 @@
 function wp_print_head_scripts() {
     do_action( 'wp_print_scripts' );
-    global $wp_scripts, $concatenate_scripts, $compress_scripts;
+    global $wp_scripts, $concatenate_scripts;
 
     if ( !is_a($wp_scripts, 'WP_Scripts') )
@@ -548 +548 @@
     $wp_scripts->do_head_items();
 
-    _pring_scripts();
+    if ( apply_filters('print_head_scripts', true) )
+        _pring_scripts();
 
     $wp_scripts->do_concat = false;
+    $wp_scripts->print_code = $wp_scripts->concat = $wp_scripts->concat_version = $wp_scripts->print_html = $wp_scripts->src = '';
     return $wp_scripts->done;
 }
@@ -571 +573 @@
     $wp_scripts->do_footer_items();
 
-    _pring_scripts();
+    if ( apply_filters('print_footer_scripts', true) )
+        _pring_scripts();
 
     $wp_scripts->do_concat = false;
+    $wp_scripts->concat = $wp_scripts->concat_version = $wp_scripts->print_code = $wp_scripts->print_html = $wp_scripts->src = '';
     return $wp_scripts->done;
 }
@@ -590 +594 @@
             echo "/* ]]> */\n";
             echo "</script>\n";
-            $wp_scripts->print_code = '';
         }
 
-        $ver = md5($wp_scripts->concat_version);
-        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . rtrim($wp_scripts->concat, ',') . "&ver=$ver";
+        $ver = md5("$wp_scripts->concat" . "$wp_scripts->concat_version");
+        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&amp;load=" . rtrim($wp_scripts->concat, ',') . "&amp;ver=$ver";
         echo "<script type='text/javascript' src='$src'></script>\n";
-        $wp_scripts->concat = $wp_scripts->concat_version = '';
     }
 
-    if ( !empty($wp_scripts->print_html) ) {
+    if ( !empty($wp_scripts->print_html) )
         echo $wp_scripts->print_html;
-        $wp_scripts->print_html = '';
-    }
+
 }
 
@@ -619 +620 @@
     $wp_styles->do_items(false);
 
-    if ( !empty($wp_styles->concat) ) {
-        $ver = md5($wp_styles->concat_version);
-        $rtl = 'rtl' === $wp_styles->text_direction ? 1 : 0;
-        $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&rtl={$rtl}&load=" . rtrim($wp_styles->concat, ',') . "&ver=$ver";
-        echo "<link rel='stylesheet' href='$href' type='text/css' media='all' />\n";
-        $wp_styles->concat = $wp_styles->concat_version = '';
+    if ( apply_filters('print_admin_styles', true) ) {
+        if ( !empty($wp_styles->concat) ) {
+            $ver = md5("$wp_styles->concat" . "$wp_styles->concat_version");
+            $rtl = 'rtl' === $wp_styles->text_direction ? 1 : 0;
+            $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&amp;rtl={$rtl}&amp;load=" . rtrim($wp_styles->concat, ',') . "&amp;ver=$ver";
+            echo "<link rel='stylesheet' href='$href' type='text/css' media='all' />\n";
+        }
+
+        if ( !empty($wp_styles->print_html) )
+            echo $wp_styles->print_html;
     }
 
-    if ( !empty($wp_styles->print_html) ) {
-        echo $wp_styles->print_html;
-        $wp_styles->print_html = '';
-    }
-
     $wp_styles->do_concat = false;
+    $wp_styles->concat = $wp_styles->concat_version = $wp_styles->print_html = '';
     return $wp_styles->done;
 }