Changeset 9276

Timestamp:

12/24/2014 08:09:13 PM (10 years ago)

Author:

djpaul

Message:

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 r9242:9245 for incremental changes that support this new functionality.

Fixes #5934. Props m@rk, imath, DJPaul.

Location:

trunk/src

Files:

• bp-activity/bp-activity-actions.php (modified) (1 diff)
• bp-activity/js/mentions.js (modified) (2 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/activity/post-form.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-actions.php

@@ -754 +754 @@
     }
 
-    $results = bp_core_get_suggestions( array(
+    $args = array(
         'term' => sanitize_text_field( $_GET['term'] ),
         'type' => sanitize_text_field( $_GET['type'] ),
-    ) );
+    );
+
+    // Support per-Group suggestions.
+    if ( ! empty( $_GET['group-id'] ) ) {
+        $args['group_id'] = absint( $_GET['group-id'] );
+    }
+
+    $results = bp_core_get_suggestions( $args );
 
     if ( is_wp_error( $results ) ) {

trunk/src/bp-activity/js/mentions.js

@@ -152 +152 @@
                  */
                 remote_filter: function( query, render_view ) {
-                    var self = $( this );
+                    var self = $( this ),
+                        params = {};
 
                     mentionsItem = mentionsQueryCache[ query ];
@@ -164 +165 @@
                     }
 
-                    self.xhr = $.getJSON( ajaxurl, { 'action': 'bp_get_suggestions', 'term': query, 'type': 'members' } )
+                    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 )
                         /**
                          * Success callback for the @suggestions lookup.

trunk/src/bp-groups/bp-groups-filters.php

@@ -234 +234 @@
 }
 add_filter( 'get_latest_topics_fields', 'groups_filter_forums_root_page_sql' );
+
+/**
+ * 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 );

trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php

@@ -28 +28 @@
     <div id="whats-new-content">
         <div id="whats-new-textarea">
-            <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>
+            <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>
         </div>