Changeset 8764 for trunk/src/bp-core/bp-core-adminbar.php

Timestamp:

08/07/2014 02:11:24 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Separate out registering and enqueing of bp-admin-bar styling.

This allows theme and plugin authors more flexibility in how they override BuddyPress's default behaviour, and also more closely follows our existing conventions for other scripts and styles.

File:

• trunk/src/bp-core/bp-core-adminbar.php (modified) (1 diff)

trunk/src/bp-core/bp-core-adminbar.php

@@ -91 +91 @@
 
 /**
- * Handle the Toolbar CSS.
+ * Handle the enqueuing of toolbar CSS.
+ *
+ * This function exists mostly for backwards compatibility reasons, so anyone
+ * previously unhooking this function can continue to do so. It's hooked to
+ * the `bp_init` action in `bp-core-actions.php`.
  *
  * @since BuddyPress (1.5.0)
  */
 function bp_core_load_admin_bar_css() {
-    global $wp_styles;
+    add_action( 'bp_enqueue_scripts',       'bp_core_enqueue_admin_bar_css', 1 );
+    add_action( 'bp_admin_enqueue_scripts', 'bp_core_enqueue_admin_bar_css', 1 );
+}
 
-    if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() )
+/**
+ * Enqueue supplemental WordPress Toolbar styling
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @see bp_core_register_common_styles()
+ * @see bp_core_load_admin_bar_css()
+ */
+function bp_core_enqueue_admin_bar_css() {
+
+    // Bail if not using WordPress's admin bar or it's not showing on this
+    // page request.
+    if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() ) {
         return;
+    }
 
-    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-    // Toolbar styles
-    $stylesheet = buddypress()->plugin_url . "bp-core/css/admin-bar{$min}.css";
-
-    wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array( 'admin-bar' ), bp_get_version() );
-    $wp_styles->add_data( 'bp-admin-bar', 'rtl', true );
-    if ( $min )
-        $wp_styles->add_data( 'bp-admin-bar', 'suffix', $min );
+    // Enqueue the additional adminbar css
+    wp_enqueue_style( 'bp-admin-bar' );
 }