Changeset 12038

Timestamp:

05/02/2018 04:18:33 PM (6 years ago)

Author:

imath

Message:

BP Nouveau: generate the Activity container before adding new entries

If the Activity container is missing, make sure to generate it before prepending new activities. If the container is available the activity will only be inserted if the activity stream can welcome it. For instance, an activity posted in a Private group will be prepended to the list only if the "My Groups" scope is active.

Fixes #7774

Location:

trunk/src/bp-templates/bp-nouveau/js

Files:

• buddypress-activity-post-form.js (modified) (2 diffs)
• buddypress-nouveau.js (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/js/buddypress-activity-post-form.js

@@ -709 +709 @@
 
             bp.ajax.post( 'post_update', _.extend( data, this.model.attributes ) ).done( function( response ) {
-                var scope     = bp.Nouveau.getStorage( 'bp-activity', 'scope' ),
-                    prepended = false;
-
-                if ( ! response.is_directory ||
-                     ( 'all' === scope && ( 'user' === self.model.get( 'object' ) || false === response.is_private ) ) ||
-                     ( self.model.get( 'object' ) + 's'  === scope )
-                    ) {
-
-                    if ( ! $( '#activity-' + response.id  ).length ) {
-                        bp.Nouveau.inject( '#activity-stream ul.activity-list', response.activity, 'prepend' );
-                        prepended = true;
-                    }
+                var store       = bp.Nouveau.getStorage( 'bp-activity' ),
+                    searchTerms = $( '[data-bp-search="activity"] input[type="search"]' ).val(), matches = {},
+                    toPrepend = false;
+
+                // Look for matches if the stream displays search results.
+                if ( searchTerms ) {
+                    searchTerms = new RegExp( searchTerms, 'im' );
+                    matches = response.activity.match( searchTerms );
+                }
+
+                /**
+                 * Before injecting the activity into the stream, we need to check the filter
+                 * and search terms are consistent with it when posting from a single item or
+                 * from the Activity directory.
+                 */
+                if ( ( ! searchTerms || matches ) ) {
+                    toPrepend = ! store.filter || 0 === parseInt( store.filter, 10 ) || 'activity_update' === store.filter;
+                }
+
+                /**
+                 * In the Activity directory, we also need to check the active scope.
+                 * eg: An update posted in a private group should only show when the
+                 * "My Groups" tab is active.
+                 */
+                if ( toPrepend && response.is_directory ) {
+                    toPrepend = ( 'all' === store.scope && ( 'user' === self.model.get( 'object' ) || false === response.is_private ) ) || ( self.model.get( 'object' ) + 's'  === store.scope );
                 }
 
@@ -726 +740 @@
                 self.resetForm();
 
-                // Stop here if the activity has been added to the stream
-                if ( prepended ) {
-                    return;
-                }
-
-                /**
-                 * Do not add to the stream if the scope is not consistent with the activity
-                 */
-                self.views.add( new bp.Views.activityFeedback( { value: response.message, type: 'updated' } ) );
+                // Display a successful feedback if the acticity is not consistent with the displayed stream.
+                if ( ! toPrepend ) {
+                    self.views.add( new bp.Views.activityFeedback( { value: response.message, type: 'updated' } ) );
+
+                // Inject the activity into the stream only if it hasn't been done already (HeartBeat).
+                } else if ( ! $( '#activity-' + response.id  ).length ) {
+
+                    // It's the very first activity, let's make sure the container can welcome it!
+                    if ( ! $( '#activity-stream ul.activity-list').length ) {
+                        $( '#activity-stream' ).html( $( '<ul></ul>').addClass( 'activity-list item-list bp-list' ) );
+                    }
+
+                    // Prepend the activity.
+                    bp.Nouveau.inject( '#activity-stream ul.activity-list', response.activity, 'prepend' );
+                }
             } ).fail( function( response ) {
 

trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -104 +104 @@
             }
 
-            if ( undefined !== property && store[property] ) {
-                return store[property];
+            if ( undefined !== property ) {
+                return store[property] || false;
             }