Changeset 12016

Timestamp:

04/30/2018 08:48:59 AM (8 years ago)

Author:

imath

Message:

BP Nouveau: bring back Heartbeat Activities

r12002 introduced a regression in Heartbeat Activities since BP Nouveau was using the removed bp-timestamp data attribute. This data attribute is back and so is the auto-refreshing activities feature.

Fixes #7782

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/activity/entry.php (modified) (1 diff)
• includes/activity/template-tags.php (modified) (1 diff)
• js/buddypress-activity.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/activity/entry.php

@@ -11 +11 @@
 bp_nouveau_activity_hook( 'before', 'entry' ); ?>
 
-<li class="<?php bp_activity_css_class(); ?>" id="activity-<?php bp_activity_id(); ?>" data-bp-activity-id="<?php bp_activity_id(); ?>">
+<li class="<?php bp_activity_css_class(); ?>" id="activity-<?php bp_activity_id(); ?>" data-bp-activity-id="<?php bp_activity_id(); ?>" data-bp-timestamp="<?php bp_nouveau_activity_timestamp(); ?>">
 
         <div class="activity-avatar item-avatar">

trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -180 +180 @@
         do_action( 'bp_activity_entry_content' );
 }
+
+/**
+ * Output the Activity timestamp into the bp-timestamp attribute.
+ *
+ * @since 3.0.0
+ */
+function bp_nouveau_activity_timestamp() {
+        echo esc_attr( bp_nouveau_get_activity_timestamp() );
+}
+
+        /**
+         * Get the Activity timestamp.
+         *
+         * @since 3.0.0
+         *
+         * @return integer The Activity timestamp.
+         */
+        function bp_nouveau_get_activity_timestamp() {
+                /**
+                 * Filter here to edit the activity timestamp.
+                 *
+                 * @since 3.0.0
+                 *
+                 * @param integer $value The Activity timestamp.
+                 */
+                return apply_filters( 'bp_nouveau_get_activity_timestamp', strtotime( bp_get_activity_date_recorded() ) );
+        }
 
 /**

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

@@ -83 +83 @@
                  */
                 heartbeatSend: function( event, data ) {
-                        this.heartbeat_data.first_recorded = $( '#buddypress [data-bp-list] [data-bp-activity-id] time' ).first().data( 'bp-timestamp' ) || 0;
+                        this.heartbeat_data.first_recorded = $( '#buddypress [data-bp-list] [data-bp-activity-id]' ).first().data( 'bp-timestamp' ) || 0;
 
                         if ( 0 === this.heartbeat_data.last_recorded || this.heartbeat_data.first_recorded > this.heartbeat_data.last_recorded ) {
@@ -588 +588 @@
 
                                                 // reset vars to get newest activities when an activity is deleted
-                                                if ( ! activity_comment_id && activity_item.find( 'time' ).first().data( 'bp-timestamp' ) === parent.Activity.heartbeat_data.last_recorded ) {
+                                                if ( ! activity_comment_id && activity_item.data( 'bp-timestamp' ) === parent.Activity.heartbeat_data.last_recorded ) {
                                                         parent.Activity.heartbeat_data.newest        = '';
                                                         parent.Activity.heartbeat_data.last_recorded  = 0;