Ticket #8415: 8415.patch

src/bp-activity/bp-activity-template.php

@@ -2662 +2662 @@
                 // Determine if we're on a single activity page, and customize accordingly.
                 if ( bp_is_activity_component() && is_numeric( bp_current_action() ) ) {
                         $class = 'delete-activity-single';
+                } elseif ( 'activity_comment' === bp_get_activity_type() ) {
+                        $class = 'acomment-delete';
                 }
 
                 $link = '<a href="' . esc_url( $url ) . '" class="button item-button bp-secondary-action ' . $class . ' confirm" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>';
@@ -2698 +2700 @@
         function bp_get_activity_delete_url() {
                 global $activities_template;
 
-                $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . $activities_template->activity->id );
+                $activity_id = 0;
+                if ( isset( $activities_template->activity->id ) ) {
+                        $activity_id = (int) $activities_template->activity->id;
+                }
+
+                $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . $activity_id );
 
                 // Determine if we're on a single activity page, and customize accordingly.
                 if ( bp_is_activity_component() && is_numeric( bp_current_action() ) ) {
                         $url = add_query_arg( array( 'redirect_to' => wp_get_referer() ), $url );
+                } elseif ( 'activity_comment' === bp_get_activity_type() ) {
+                        $url = add_query_arg( 'cid', $activity_id, $url );
                 }
 
                 $url = wp_nonce_url( $url, 'bp_activity_delete_link' );

src/bp-templates/bp-legacy/js/buddypress.js

@@ -557 +557 @@
                         c_id = target.attr('href').substr( 10, target.attr('href').length );
                         form = jq( '#ac-form-' + a_id );
 
+                        if ( ! form.length ) {
+                                var viewDiscussionLink = target.closest( 'li.activity' ).find( '.activity-meta a.view' ).prop( 'href' );
+
+                                if ( viewDiscussionLink ) {
+                                        window.location.href = viewDiscussionLink;
+                                }
+
+                                return false;
+                        }
+
                         form.css( 'display', 'none' );
                         form.removeClass('root');
                         jq('.ac-form').hide();
@@ -671 +681 @@
                 /* Deleting an activity comment */
                 if ( target.hasClass('acomment-delete') ) {
                         link_href = target.attr('href');
-                        comment_li = target.parent().parent();
-                        form = comment_li.parents('div.activity-comments').children('form');
+                        comment_li = target.closest( 'li' );
+
+                        form = comment_li.find( 'form.ac-form' );
 
                         nonce = link_href.split('_wpnonce=');
                         nonce = nonce[1];
@@ -687 +698 @@
                         jq('.activity-comments ul .error').remove();
 
                         /* Reset the form position */
-                        comment_li.parents('.activity-comments').append(form);
+                        if ( form && form.length ) {
+                                comment_li.closest( '.activity-comments' ).append( form );
+                        }
 
                         jq.post( ajaxurl, {
                                 action: 'delete_activity_comment',

src/bp-templates/bp-nouveau/buddypress/activity/comment.php

@@ -6 +6 @@
  * each activity.
  *
  * @since 3.0.0
- * @version 7.0.0
+ * @version 10.0.0
  */
 
 bp_nouveau_activity_hook( 'before', 'comment' ); ?>
 
-<li id="acomment-<?php bp_activity_comment_id(); ?>" class="comment-item" data-bp-activity-comment-id="<?php bp_activity_comment_id(); ?>">
+<li id="acomment-<?php bp_activity_comment_id(); ?>" class="comment-item" <?php bp_nouveau_activity_data_attribute_id(); ?>>
         <div class="acomment-avatar item-avatar">
                 <a href="<?php bp_activity_comment_user_link(); ?>">
                         <?php

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

@@ -6 +6 @@
  * each activity.
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 10.0.0
  */
 
 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(); ?>" data-bp-timestamp="<?php bp_nouveau_activity_timestamp(); ?>">
+<li class="<?php bp_activity_css_class(); ?>" id="activity-<?php bp_activity_id(); ?>" <?php bp_nouveau_activity_data_attribute_id(); ?> data-bp-timestamp="<?php bp_nouveau_activity_timestamp(); ?>">
 
         <div class="activity-avatar item-avatar">
 

src/bp-templates/bp-nouveau/includes/activity/ajax.php

@@ -3 +3 @@
  * Activity Ajax functions
  *
  * @since 3.0.0
- * @version 8.1.0
+ * @version 10.0.0
  */
 
 // Exit if accessed directly.
@@ -232 +232 @@
 
         // Deleting an activity comment.
         if ( ! empty( $_POST['is_comment'] ) ) {
+                // Get replies before they are deleted.
+                $replies   = (array) BP_Activity_Activity::get_child_comments( $activity->id );
+                $reply_ids = wp_list_pluck( $replies, 'id' );
+
                 if ( ! bp_activity_delete_comment( $activity->item_id, $activity->id ) ) {
                         wp_send_json_error( $response );
+
+                        // The comment and its replies has been deleted successfully.
+                } else {
+                        $response = array(
+                                'deleted' => array_merge(
+                                        array( $activity->id ),
+                                        $reply_ids
+                                ),
+                        );
                 }
 
         // Deleting an activity.
         } else {
                 if ( ! bp_activity_delete( array( 'id' => $activity->id, 'user_id' => $activity->user_id ) ) ) {
                         wp_send_json_error( $response );
+
+                        // The activity has been deleted successfully.
+                } else {
+                        $response = array(
+                                'deleted' => array( $activity->id ),
+                        );
                 }
         }
 
         /** This action is documented in bp-activity/bp-activity-actions.php */
         do_action( 'bp_activity_action_delete_activity', $activity->id, $activity->user_id );
 
-        // The activity has been deleted successfully
-        $response = array( 'deleted' => $activity->id );
-
         // If on a single activity redirect to user's home.
         if ( ! empty( $_POST['is_single'] ) ) {
                 $response['redirect'] = bp_core_get_user_domain( $activity->user_id );

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

@@ -3 +3 @@
  * Activity Template tags
  *
  * @since 3.0.0
- * @version 8.1.0
+ * @version 10.0.0
  */
 
 // Exit if accessed directly.
@@ -146 +146 @@
         bp_nouveau_hook( $hook );
 }
 
+/**
+ * Output the `data-bp-activity-id` or `data-bp-activity-comment-id` attribute
+ * according to the activity type.
+ *
+ * @since 10.0.0
+ */
+function bp_nouveau_activity_data_attribute_id() {
+        $attribute  = 'data-bp-%1$s-id="%2$s"';
+        $type       = 'activity';
+        $id         = (int) bp_get_activity_id();
+        $comment_id = (int) bp_get_activity_comment_id();
+
+        if ( 'activity_comment' === bp_get_activity_type() || $comment_id ) {
+                $type = 'activity-comment';
+
+
+                if ( $comment_id ) {
+                        $id = $comment_id;
+                }
+        }
+
+        printf( $attribute, $type, $id );
+}
+
 /**
  * Checks if an activity of the loop has some content.
  *

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

@@ -1 +1 @@
 /* jshint browser: true */
 /* global BP_Nouveau */
 /* @since 3.0.0 */
-/* @version 8.0.0 */
+/* @version 10.0.0 */
 window.bp = window.bp || {};
 
 ( function( bp, $ ) {
@@ -556 +556 @@
                                         li_parent = activity_comment_li;
                                 }
 
+                                // Move the form if needed
+                                if ( activity_comment_li.find( 'form' ).length ) {
+                                        activity_item.find( '.activity-comments' ).append( activity_comment_li.find( 'form' ) );
+                                }
+
                                 parent.ajax( ajaxData, 'activity' ).done( function( response ) {
                                         target.removeClass( 'loading' );
 
@@ -570 +575 @@
 
                                                 if ( activity_comment_id ) {
                                                         deleted_comments_count = 1;
+                                                        if ( response.data.deleted ) {
+                                                                deleted_comments_count = response.data.deleted.length;
 
-                                                        // Move the form if needed
-                                                        activity_item.append( activity_comment_li.find( 'form' ) );
-
-                                                        // Count child comments if there are some
-                                                        $.each( activity_comment_li.find( 'li' ), function() {
-                                                                deleted_comments_count += 1;
-                                                        } );
+                                                                response.data.deleted.forEach( function( cid ) {
+                                                                        $( '[data-bp-activity-comment-id="' + cid + '"]' ).remove();
+                                                                } );
+                                                        } else {
+                                                                // Count child comments if there are some
+                                                                $.each( activity_comment_li.find( 'li' ), function() {
+                                                                        deleted_comments_count += 1;
+                                                                } );
+                                                        }
 
                                                         // Update the button count
                                                         comment_count_span = activity_item.find( '.acomment-reply span.comment-count' );
@@ -660 +669 @@
                                 // Stop event propagation
                                 event.preventDefault();
 
+                                if ( ! form.length ) {
+                                        var viewDiscussionLink = target.closest( 'li.activity' ).find( '.activity-meta a.view' ).prop( 'href' );
+
+                                        if ( viewDiscussionLink ) {
+                                                window.location.href = viewDiscussionLink;
+                                        }
+
+                                        return false;
+                                }
+
                                 // If the comment count span inside the link is clicked
                                 if ( target.parent().hasClass( 'acomment-reply' ) ) {
                                         comment_link = target.parent();