<!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][8773] trunk/src/bp-activity/bp-activity-cssjs.php: Activity: Combine the @mentions enqueuing function.</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/8773">8773</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-08-09 16:30:44 +0000 (Sat, 09 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Activity: Combine the @mentions enqueuing function.
Previously, there was a function for loading in both admin and frontend contexts.
I've combined the loading into one function which removes a bunch of duplicated logic, probably left over from an early approach at building the suggestions feature.
See <a href="http://buddypress.trac.wordpress.org/ticket/3278">#3278</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitycssjsphp">trunk/src/bp-activity/bp-activity-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitycssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-cssjs.php (8772 => 8773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-cssjs.php 2014-08-09 16:22:03 UTC (rev 8772)
+++ trunk/src/bp-activity/bp-activity-cssjs.php 2014-08-09 16:30:44 UTC (rev 8773)
</span><span class="lines">@@ -20,39 +20,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
- wp_enqueue_script( 'bp-mentions', buddypress()->plugin_url . "bp-activity/js/mentions{$min}.js", array( 'jquery', 'jquery-atwho' ), bp_get_version(), true );
- wp_enqueue_style( 'bp-mentions-css', buddypress()->plugin_url . "bp-activity/css/mentions{$min}.css", array(), bp_get_version() );
-
- wp_style_add_data( 'bp-mentions-css', 'rtl', true );
- if ( $min ) {
- wp_style_add_data( 'bp-mentions-css', 'suffix', $min );
</del><ins>+ // Special handling for New/Edit screens in wp-admin
+ if ( is_admin() ) {
+ if (
+ ! get_current_screen() ||
+ ! in_array( get_current_screen()->base, array( 'page', 'post' ) ) ||
+ ! post_type_supports( get_current_screen()->post_type, 'editor' ) ) {
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Print a list of the current user's friends to the page for quicker @mentions lookups.
- do_action( 'bp_activity_mentions_prime_results' );
-}
-add_action( 'bp_enqueue_scripts', 'bp_activity_mentions_script' );
</del><span class="cx">
</span><del>-/**
- * Enqueue @mentions JS in wp-admin.
- *
- * @since BuddyPress (2.1)
- */
-function bp_activity_mentions_dashboard_script() {
- if ( ! bp_activity_maybe_load_mentions_scripts() ) {
- return;
- }
-
- // Special handling for New/Edit screens in wp-admin
- if (
- ! get_current_screen() ||
- ! in_array( get_current_screen()->base, array( 'page', 'post' ) ) ||
- ! post_type_supports( get_current_screen()->post_type, 'editor' ) ) {
- return;
- }
-
</del><span class="cx"> $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'bp-mentions', buddypress()->plugin_url . "bp-activity/js/mentions{$min}.js", array( 'jquery', 'jquery-atwho' ), bp_get_version(), true );
</span><span class="lines">@@ -66,4 +44,5 @@
</span><span class="cx"> // Print a list of the current user's friends to the page for quicker @mentions lookups.
</span><span class="cx"> do_action( 'bp_activity_mentions_prime_results' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_dashboard_script' );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_action( 'bp_enqueue_scripts', 'bp_activity_mentions_script' );
+add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_script' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>