Changeset 12002

Timestamp:

04/27/2018 04:52:27 PM (7 years ago)

Author:

imath

Message:

BP Nouveau: use Moment.js & Livestamp.js to update activity timestamps

Before these two JavaScript libraries were introduced in BuddyPress Core (2.7.0), i added some custom JavaScript code to perform the dynamic activity timestamp update task. Now these two libraries are available and do the job way better, it is about time to say goodbye to this code.

Fixes #7772

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress-functions.php (modified) (1 diff)
• includes/activity/functions.php (modified) (1 diff)
• includes/activity/loader.php (modified) (1 diff)
• js/buddypress-activity.js (modified) (1 diff)
• js/buddypress-nouveau.js (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -383 +383 @@
             'view'                => __( 'View', 'buddypress' ),
             'object_nav_parent'   => '#buddypress',
-            'time_since'          => array(
-                'sometime'    => _x( 'sometime', 'javascript time since', 'buddypress' ),
-                'now'         => _x( 'right now', 'javascript time since', 'buddypress' ),
-                'ago'         => _x( '% ago', 'javascript time since', 'buddypress' ),
-                'separator'   => _x( ',', 'Separator in javascript time since', 'buddypress' ),
-                'year'        => _x( '% year', 'javascript time since singular', 'buddypress' ),
-                'years'       => _x( '% years', 'javascript time since plural', 'buddypress' ),
-                'month'       => _x( '% month', 'javascript time since singular', 'buddypress' ),
-                'months'      => _x( '% months', 'javascript time since plural', 'buddypress' ),
-                'week'        => _x( '% week', 'javascript time since singular', 'buddypress' ),
-                'weeks'       => _x( '% weeks', 'javascript time since plural', 'buddypress' ),
-                'day'         => _x( '% day', 'javascript time since singular', 'buddypress' ),
-                'days'        => _x( '% days', 'javascript time since plural', 'buddypress' ),
-                'hour'        => _x( '% hour', 'javascript time since singular', 'buddypress' ),
-                'hours'       => _x( '% hours', 'javascript time since plural', 'buddypress' ),
-                'minute'      => _x( '% minute', 'javascript time since singular', 'buddypress' ),
-                'minutes'     => _x( '% minutes', 'javascript time since plural', 'buddypress' ),
-                'second'      => _x( '% second', 'javascript time since singular', 'buddypress' ),
-                'seconds'     => _x( '% seconds', 'javascript time since plural', 'buddypress' ),
-                'time_chunks' => array(
-                    'a_year'   => YEAR_IN_SECONDS,
-                    'b_month'  => 30 * DAY_IN_SECONDS,
-                    'c_week'   => WEEK_IN_SECONDS,
-                    'd_day'    => DAY_IN_SECONDS,
-                    'e_hour'   => HOUR_IN_SECONDS,
-                    'f_minute' => MINUTE_IN_SECONDS,
-                    'g_second' => 1,
-                ),
-            ),
         );
 

trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -426 +426 @@
 
     return $classes;
-}
-
-/**
- * @since 3.0.0
- */
-function bp_nouveau_activity_time_since( $time_since, $activity = null ) {
-    if ( ! isset( $activity->date_recorded ) ) {
-        return $time_since;
-    }
-
-    return apply_filters(
-        'bp_nouveau_activity_time_since', sprintf(
-            '<time class="time-since" datetime="%1$s" data-bp-timestamp="%2$d">%3$s</time>',
-            esc_attr( $activity->date_recorded ),
-            esc_attr( strtotime( $activity->date_recorded ) ),
-            esc_attr( bp_core_time_since( $activity->date_recorded ) )
-        )
-    );
-}
-
-/**
- * @since 3.0.0
- */
-function bp_nouveau_activity_allowed_tags( $activity_allowedtags = array() ) {
-    $activity_allowedtags['time']                      = array();
-    $activity_allowedtags['time']['class']             = array();
-    $activity_allowedtags['time']['datetime']          = array();
-    $activity_allowedtags['time']['data-bp-timestamp'] = array();
-
-    return $activity_allowedtags;
 }
 

trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php

@@ -97 +97 @@
         add_filter( 'bp_get_activity_action_pre_meta', 'bp_nouveau_activity_secondary_avatars', 10, 2 );
         add_filter( 'bp_get_activity_css_class', 'bp_nouveau_activity_scope_newest_class', 10, 1 );
-        add_filter( 'bp_activity_time_since', 'bp_nouveau_activity_time_since', 10, 2 );
-        add_filter( 'bp_activity_allowed_tags', 'bp_nouveau_activity_allowed_tags', 10, 1 );
     }
 }

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

@@ -96 +96 @@
 
             $.extend( data, { bp_heartbeat: bp.Nouveau.getStorage( 'bp-activity' ) } );
-
-            // Update all displayed time
-            $.each( $( '#buddypress time' ), function( t, time ) {
-                if ( $( time ).data( 'bp-timestamp' ) ) {
-                    $( time ).html( bp.Nouveau.updateTimeSince( Number( $( time ).data( 'bp-timestamp' ) ) ) );
-                }
-            } );
         },
 

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

@@ -49 +49 @@
             this.objects                = $.map( BP_Nouveau.objects, function( value ) { return value; } );
             this.objectNavParent        = BP_Nouveau.object_nav_parent;
-            this.time_since             = BP_Nouveau.time_since;
 
             // HeartBeat Global
@@ -206 +205 @@
             } else {
                 $( selector ).html( content );
-            }
-        },
-
-        /**
-         * [updateTimeSince description]
-         * @param  {[type]} timestamp [description]
-         * @return {[type]}           [description]
-         */
-        updateTimeSince: function( timestamp ) {
-            var now = new Date( $.now() ), diff, count_1, chunk_1, count_2, chunk_2,
-                time_since = [], time_chunks = $.extend( {}, this.time_since.time_chunks ), ms;
-
-            // Returns sometime
-            if ( undefined === timestamp ) {
-                return this.time_since.sometime;
-            }
-
-            // Javascript timestamps are in ms.
-            timestamp = new Date( timestamp * 1000 );
-
-            // Calculate the diff
-            diff = now - timestamp;
-
-            // Returns right now
-            if ( 0 === diff ) {
-                return this.time_since.now;
-            }
-
-            $.each( time_chunks, function( c, chunk ) {
-                var milliseconds = chunk * 1000;
-                var rounded_time = Math.floor( diff / milliseconds );
-
-                if ( 0 !== rounded_time && ! chunk_1 ) {
-                    chunk_1 = c;
-                    count_1 = rounded_time;
-                    ms      = milliseconds;
-                }
-            } );
-
-            // First chunk
-            chunk_1 = chunk_1.substr( 2 );
-            time_since.push( ( 1 === count_1 ) ? this.time_since[ chunk_1 ].replace( '%', count_1 ) : this.time_since[ chunk_1 + 's' ].replace( '%', count_1 ) );
-
-            // Remove Year from chunks
-            delete time_chunks.a_year;
-
-            $.each( time_chunks, function( c, chunk ) {
-                var milliseconds = chunk * 1000;
-                var rounded_time = Math.floor( ( diff - ( ms * count_1 ) ) / milliseconds );
-
-                if ( 0 !== rounded_time && ! chunk_2 ) {
-                    chunk_2 = c;
-                    count_2 = rounded_time;
-                }
-            } );
-
-            // Second chunk
-            if ( undefined !== chunk_2 ) {
-                chunk_2 = chunk_2.substr( 2 );
-                time_since.push( ( 1 === count_2 ) ? this.time_since[ chunk_2 ].replace( '%', count_2 ) : this.time_since[ chunk_2 + 's' ].replace( '%', count_2 ) );
-            }
-
-            // Returns x time, y time ago
-            if ( time_since.length >= 1 ) {
-                return this.time_since.ago.replace( '%', time_since.join( this.time_since.separator + ' ' ) );
-
-            // Returns sometime
-            } else {
-                return this.time_since.sometime;
             }
         },