Changeset 21672

Timestamp:

08/30/2012 06:57:57 PM (12 years ago)

Author:

nacin

Message:

Have wp_script_is() and wp_style_is() accept 'enqueued', as it reads better than 'queue' and is consistent with 'registered'. fixes #21741.

Location:

trunk/wp-includes

Files:

• class.wp-dependencies.php (modified) (1 diff)
• functions.wp-scripts.php (modified) (2 diffs)
• functions.wp-styles.php (modified) (3 diffs)

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

@@ -197 +197 @@
     }
 
-    function query( $handle, $list = 'registered' ) { // registered, queue, done, to_do
-        switch ( $list ) :
-        case 'registered':
-        case 'scripts': // back compat
-            if ( isset($this->registered[$handle]) )
-                return $this->registered[$handle];
-            break;
-        case 'to_print': // back compat
-        case 'printed': // back compat
-            if ( 'to_print' == $list )
-                $list = 'to_do';
-            else
-                $list = 'printed';
-        default:
-            if ( in_array($handle, $this->$list) )
-                return true;
-            break;
-        endswitch;
+
+    function query( $handle, $list = 'registered' ) {
+        switch ( $list ) {
+            case 'registered' :
+            case 'scripts': // back compat
+                if ( isset( $this->registered[ $handle ] ) )
+                    return $this->registered[ $handle ];
+                return false;
+
+            case 'enqueued' :
+            case 'queue' :
+                return in_array( $handle, $this->queue );
+
+            case 'to_do' :
+            case 'to_print': // back compat
+                return in_array( $handle, $this->to_do );
+
+            case 'done' :
+            case 'printed': // back compat
+                return in_array( $handle, $this->done );
+        }
         return false;
     }

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

@@ -162 +162 @@
  * Check whether script has been added to WordPress Scripts.
  *
- * The values for list defaults to 'queue', which is the same as enqueue for
- * scripts.
+ * By default, checks if the script has been enqueued. You can also
+ * pass 'registered' to $list, to see if the script is registered,
+ * and you can check processing statuses with 'to_do' and 'done'.
  *
  * @since WP unknown; BP unknown
  *
- * @param string $handle Handle used to add script.
- * @param string $list Optional, defaults to 'queue'. Others values are 'registered', 'queue', 'done', 'to_do'
- * @return bool
+ * @param string $handle Name of the script.
+ * @param string $list Optional. Defaults to 'enqueued'. Values are
+ *  'registered', 'enqueued' (or 'queue'), 'to_do', and 'done'.
+ * @return bool Whether script is in the list.
  */
-function wp_script_is( $handle, $list = 'queue' ) {
+function wp_script_is( $handle, $list = 'enqueued' ) {
     global $wp_scripts;
     if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
@@ -180 +182 @@
     }
 
-    $query = $wp_scripts->query( $handle, $list );
-
-    if ( is_object( $query ) )
-        return true;
-
-    return $query;
+    return (bool) $wp_scripts->query( $handle, $list );
 }

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

@@ -168 +168 @@
  * Check whether style has been added to WordPress Styles.
  *
- * The values for list defaults to 'queue', which is the same as wp_enqueue_style().
+ * By default, checks if the style has been enqueued. You can also
+ * pass 'registered' to $list, to see if the style is registered,
+ * and you can check processing statuses with 'to_do' and 'done'.
  *
  * @since WP unknown; BP unknown
@@ -174 +176 @@
  *
  * @param string $handle Name of the stylesheet.
- * @param string $list Values are 'registered', 'done', 'queue' and 'to_do'.
- * @return bool True on success, false on failure.
+ * @param string $list Optional. Defaults to 'enqueued'. Values are
+ *  'registered', 'enqueued' (or 'queue'), 'to_do', and 'done'.
+ * @return bool Whether style is in the list.
  */
-function wp_style_is( $handle, $list = 'queue' ) {
+function wp_style_is( $handle, $list = 'enqueued' ) {
     global $wp_styles;
     if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
@@ -186 +189 @@
     }
 
-    $query = $wp_styles->query( $handle, $list );
-
-    if ( is_object( $query ) )
-        return true;
-
-    return $query;
+    return (bool) $wp_styles->query( $handle, $list );
 }