<!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][9276] trunk/src: Groups, Suggestions: add support for @mentions UI in Group Activity screens.</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/9276">9276</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/9276","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>2014-12-24 20:09:13 +0000 (Wed, 24 Dec 2014)</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'>Groups, Suggestions: add support for @mentions UI in Group Activity screens.
This is achieved by adding support for a new `data-suggestions-group-id` property to the relevant textarea/input element.
See also <a href="http://buddypress.trac.wordpress.org/changeset/9242">r9242</a>:9245 for incremental changes that support this new functionality.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5934">#5934</a>. Props m@rk, imath, DJPaul.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityactionsphp">trunk/src/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunksrcbpactivityjsmentionsjs">trunk/src/bp-activity/js/mentions.js</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfiltersphp">trunk/src/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressactivitypostformphp">trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-actions.php 2014-12-24 16:30:10 UTC (rev 9275)
+++ trunk/src/bp-activity/bp-activity-actions.php 2014-12-24 20:09:13 UTC (rev 9276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,11 +753,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $results = bp_core_get_suggestions( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term' => sanitize_text_field( $_GET['term'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => sanitize_text_field( $_GET['type'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Support per-Group suggestions.
+ if ( ! empty( $_GET['group-id'] ) ) {
+ $args['group_id'] = absint( $_GET['group-id'] );
+ }
+
+ $results = bp_core_get_suggestions( $args );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $results ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $results->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span></span></pre></div>
<a id="trunksrcbpactivityjsmentionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/js/mentions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/js/mentions.js 2014-12-24 16:30:10 UTC (rev 9275)
+++ trunk/src/bp-activity/js/mentions.js 2014-12-24 20:09:13 UTC (rev 9276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (2.1.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> remote_filter: function( query, render_view ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var self = $( this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = $( this ),
+ params = {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mentionsItem = mentionsQueryCache[ query ];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof mentionsItem === 'object' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +164,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self.xhr.abort();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.xhr = $.getJSON( ajaxurl, { 'action': 'bp_get_suggestions', 'term': query, 'type': 'members' } )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ params = { 'action': 'bp_get_suggestions', 'term': query, 'type': 'members' };
+
+ if ( $.isNumeric( this.$inputor.data( 'suggestions-group-id' ) ) ) {
+ params['group-id'] = parseInt( this.$inputor.data( 'suggestions-group-id' ), 10 );
+ }
+
+ self.xhr = $.getJSON( ajaxurl, params )
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Success callback for the @suggestions lookup.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-filters.php 2014-12-24 16:30:10 UTC (rev 9275)
+++ trunk/src/bp-groups/bp-groups-filters.php 2014-12-24 20:09:13 UTC (rev 9276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,3 +233,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'groups_filter_bbpress_root_page_sql', 't.topic_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_latest_topics_fields', 'groups_filter_forums_root_page_sql' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Should BuddyPress load the mentions scripts and related assets, including results to prime the
+ * mentions suggestions?
+ *
+ * @param bool $load_mentions True to load mentions assets, false otherwise.
+ * @param bool $mentions_enabled True if mentions are enabled.
+ * @return bool True if mentions scripts should be loaded.
+ * @since BuddyPress (2.2.0)
+ */
+function bp_groups_maybe_load_mentions_scripts( $load_mentions, $mentions_enabled ) {
+ if ( ! $mentions_enabled ) {
+ return $load_mentions;
+ }
+
+ if ( $load_mentions || ( bp_is_group_activity() || bp_is_group_home() ) ) {
+ return true;
+ }
+
+ return $load_mentions;
+}
+add_filter( 'bp_activity_maybe_load_mentions_scripts', 'bp_groups_maybe_load_mentions_scripts', 10, 2 );
</ins></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressactivitypostformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php 2014-12-24 16:30:10 UTC (rev 9275)
+++ trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php 2014-12-24 20:09:13 UTC (rev 9276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="whats-new-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="whats-new-textarea">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea class="bp-suggestions" name="whats-new" id="whats-new" cols="50" rows="10"><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_textarea( $_GET['r'] ); ?> <?php endif; ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea class="bp-suggestions" name="whats-new" id="whats-new" cols="50" rows="10"
+ <?php
+ if ( bp_is_group() ) : ?>data-suggestions-group-id="<?php echo esc_attr( (int) bp_get_current_group_id() ); ?>" <?php endif;
+ if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_textarea( $_GET['r'] ); ?> <?php endif;
+ ?>
+ ></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="whats-new-options">
</span></span></pre>
</div>
</div>
</body>
</html>