<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8764] trunk/src/bp-core: Separate out registering and enqueing of `bp-admin-bar` styling.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8764">8764</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-08-07 14:11:24 +0000 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreadminbarphp">trunk/src/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunksrcbpcorebpcorecssjsphp">trunk/src/bp-core/bp-core-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-adminbar.php (8763 => 8764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-adminbar.php 2014-08-06 21:52:50 UTC (rev 8763)
+++ trunk/src/bp-core/bp-core-adminbar.php 2014-08-07 14:11:24 UTC (rev 8764)
</span><span class="lines">@@ -90,23 +90,35 @@
</span><span class="cx"> add_action( 'init', 'bp_core_load_admin_bar', 9 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle the Toolbar CSS.
</del><ins>+ * Handle the enqueuing of toolbar CSS.
</ins><span class="cx"> *
</span><ins>+ * 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`.
+ *
</ins><span class="cx"> * @since BuddyPress (1.5.0)
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_admin_bar_css() {
</span><del>- global $wp_styles;
</del><ins>+ 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 );
+}
</ins><span class="cx">
</span><del>- if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() )
</del><ins>+/**
+ * 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() ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- $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 );
-}
</del><ins>+ // Enqueue the additional adminbar css
+ wp_enqueue_style( 'bp-admin-bar' );
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-cssjs.php (8763 => 8764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-cssjs.php 2014-08-06 21:52:50 UTC (rev 8763)
+++ trunk/src/bp-core/bp-core-cssjs.php 2014-08-07 14:11:24 UTC (rev 8764)
</span><span class="lines">@@ -38,6 +38,30 @@
</span><span class="cx"> add_action( 'bp_admin_enqueue_scripts', 'bp_core_register_common_scripts', 1 );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Register styles commonly used by BuddyPress.
+ *
+ * @since BuddyPress (2.1.0)
+ */
+function bp_core_register_common_styles() {
+ $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.css' : '.min.css';
+ $url = buddypress()->plugin_url . 'bp-core/css/';
+
+ $styles = apply_filters( 'bp_core_register_common_styles', array(
+ 'bp-admin-bar' => array(
+ 'file' => apply_filters( 'bp_core_admin_bar_css', "{$url}admin-bar{$ext}" ),
+ 'dependencies' => array( 'admin-bar' )
+ )
+ ) );
+
+ $version = bp_get_version();
+ foreach ( $styles as $id => $style ) {
+ wp_register_style( $id, $style['file'], $style['dependencies'], $version );
+ }
+}
+add_action( 'bp_enqueue_scripts', 'bp_core_register_common_styles', 1 );
+add_action( 'bp_admin_enqueue_scripts', 'bp_core_register_common_styles', 1 );
+
+/**
</ins><span class="cx"> * Load the JS for "Are you sure?" .confirm links.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_confirmation_js() {
</span></span></pre>
</div>
</div>
</body>
</html>