Changeset 31192

Timestamp:

01/16/2015 02:06:03 AM (10 years ago)

Author:

wonderboymusic

Message:

functions.wp-scripts.php contains a lot of duplicated code. Make 2 new functions: wp_scripts() and wp_scripts_maybe_doing_it_wrong( $function ), to encapsulate the repeated logic.

Props GaryJ, scribu, wonderboymusic.
Fixes #20513.

File:

• trunk/src/wp-includes/functions.wp-scripts.php (modified) (9 diffs)

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

@@ -8 +8 @@
  * @subpackage BackPress
  */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /**
@@ -32 +69 @@
      */
     do_action( 'wp_print_scripts' );
-    if ( '' === $handles ) // for wp_head
+    if ( '' === $handles ) // for wp_head
         $handles = false;
-
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-
-        if ( !$handles )
-            return array(); // No need to instantiate if nothing is there.
-        else
-            $wp_scripts = new WP_Scripts();
-    }
-
-    return $wp_scripts->do_items( $handles );
+    }
+
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+
+    if ( ! $handles ) {
+        return array(); // No need to instantiate if nothing is there.
+    }
+    return wp_scripts()->do_items( $handles );
 }
 
@@ -72 +103 @@
  */
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-        $wp_scripts = new WP_Scripts();
-    }
+    $wp_scripts = wp_scripts();
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
     $wp_scripts->add( $handle, $src, $deps, $ver );
-    if ( $in_footer )
+    if ( $in_footer )
         $wp_scripts->add_data( $handle, 'group', 1 );
+
 }
 
@@ -117 +144 @@
     global $wp_scripts;
     if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-
+        wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
         return false;
     }
 
-    return $wp_scripts->localize( $handle, $object_name, $l10n );
+    return ->localize( $handle, $object_name, $l10n );
 }
 
@@ -141 +165 @@
  */
 function wp_deregister_script( $handle ) {
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-        $wp_scripts = new WP_Scripts();
-    }
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
     /**
@@ -174 +192 @@
     }
 
-    $wp_scripts->remove( $handle );
+    ->remove( $handle );
 }
 
@@ -197 +215 @@
  */
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-        $wp_scripts = new WP_Scripts();
-    }
+    $wp_scripts = wp_scripts();
+
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
     $_handle = explode( '?', $handle );
@@ -229 +243 @@
  */
 function wp_dequeue_script( $handle ) {
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-        $wp_scripts = new WP_Scripts();
-    }
-
-    $wp_scripts->dequeue( $handle );
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+
+    wp_scripts()->dequeue( $handle );
 }
 
@@ -254 +262 @@
  */
 function wp_script_is( $handle, $list = 'enqueued' ) {
-    global $wp_scripts;
-    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-        if ( ! did_action( 'init' ) )
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
-                '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>login_enqueue_scripts</code>' ), '3.3' );
-        $wp_scripts = new WP_Scripts();
-    }
-
-    return (bool) $wp_scripts->query( $handle, $list );
-}
+    wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+
+    return (bool) wp_scripts()->query( $handle, $list );
+}