<!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][10416] trunk/src/bp-core/bp-core-admin.php: Core, Admin: register scripts/styles before enqueuing.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10416">10416</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10416","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-18 22:40:06 +0000 (Fri, 18 Dec 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Core, Admin: register scripts/styles before enqueuing.
This mirrors the change introduced in `bp_core_register_common_scripts`
in BP 2.1, which gave us a central place to register common,
non-component specific, scripts and styles to be used elsewhere,
without duplicating the enqueue.
This will be used by <a href="http://buddypress.trac.wordpress.org/ticket/6592">#6592</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-admin.php 2015-12-18 22:33:50 UTC (rev 10415)
+++ trunk/src/bp-core/bp-core-admin.php 2015-12-18 22:40:06 UTC (rev 10416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,6 +142,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( bp_core_admin_hook(), array( $this, 'admin_menus' ), 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Enqueue all admin JS and CSS.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'bp_admin_enqueue_scripts', array( $this, 'admin_register_styles' ), 1 );
+ add_action( 'bp_admin_enqueue_scripts', array( $this, 'admin_register_scripts' ), 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* BuddyPress Actions ************************************************/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,24 +475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function enqueue_scripts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
- $file = $this->css_url . "common{$min}.css";
-
- /**
- * Filters the BuddyPress Core Admin CSS file path.
- *
- * @since 1.6.0
- *
- * @param string $file File path for the admin CSS.
- */
- $file = apply_filters( 'bp_core_admin_common_css', $file );
- wp_enqueue_style( 'bp-admin-common-css', $file, array(), bp_get_version() );
-
- wp_style_add_data( 'bp-admin-common-css', 'rtl', true );
- if ( $min ) {
- wp_style_add_data( 'bp-admin-common-css', 'suffix', $min );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'bp-admin-common-css' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** About *****************************************************************/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -888,6 +873,79 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Done!
</span><span class="cx" style="display: block; padding: 0 10px"> return $display;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Register styles commonly used by BuddyPress wp-admin screens.
+ *
+ * @since 2.5.0
+ */
+ public function admin_register_styles() {
+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+ $url = $this->css_url;
+
+ /**
+ * Filters the BuddyPress Core Admin CSS file path.
+ *
+ * @since 1.6.0
+ *
+ * @param string $file File path for the admin CSS.
+ */
+ $common_css = apply_filters( 'bp_core_admin_common_css', "{$url}common{$min}.css" );
+
+ /**
+ * Filters the BuddyPress admin stylesheet files to register.
+ *
+ * @since 2.5.0
+ *
+ * @param array $value Array of admin stylesheet file information to register.
+ */
+ $styles = apply_filters( 'bp_core_admin_register_styles', array(
+ // Legacy
+ 'bp-admin-common-css' => array(
+ 'file' => $common_css,
+ 'dependencies' => array(),
+ ),
+ ) );
+
+
+ $version = bp_get_version();
+
+ foreach ( $styles as $id => $style ) {
+ wp_register_style( $id, $style['file'], $style['dependencies'], $version );
+ wp_style_add_data( $id, 'rtl', true );
+
+ if ( $min ) {
+ wp_style_add_data( $id, 'suffix', $min );
+ }
+ }
+ }
+
+ /**
+ * Register JS commonly used by BuddyPress wp-admin screens.
+ *
+ * @since 2.5.0
+ */
+ public function admin_register_scripts() {
+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+ $url = $this->js_url;
+
+ /**
+ * Filters the BuddyPress admin JS files to register.
+ *
+ * @since 2.5.0
+ *
+ * @param array $value Array of admin JS file information to register.
+ */
+ $scripts = apply_filters( 'bp_core_admin_register_scripts', array(
+ ) );
+
+
+ $version = bp_get_version();
+
+ foreach ( $scripts as $id => $script ) {
+ wp_register_script( $id, $script['file'], $script['dependencies'], $version, $script['footer'] );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // End class_exists check.
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>