Changeset 2370

Timestamp:

01/19/2010 08:38:20 PM (17 years ago)

Author:

apeatling

Message:

Better activity delete usability.

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (2 diffs)

trunk/bp-activity/bp-activity-templatetags.php

@@ -473 +473 @@
                                 /* Delete link */
                                 if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id )
-                                        $content .= ' &middot; <a href="' . wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment->id, 'delete_activity_comment' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
+                                        $content .= ' &middot; <a href="' . wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
 
                                 $content .= '</div>';

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -145 +145 @@
 add_action( 'wp_ajax_new_activity_comment', 'bp_dtheme_new_activity_comment' );
 
-function bp_dtheme_delete_activity_comment() {
+function bp_dtheme_delete_activity() {
         /* Check the nonce */
-        check_admin_referer( 'delete_activity_comment' );
+        check_admin_referer( 'bp_activity_delete_link' );
 
         if ( !is_user_logged_in() ) {
@@ -154 +154 @@
         }
 
-        if ( empty( $_POST['comment_id'] ) || !is_numeric( $_POST['comment_id'] ) || !bp_activity_delete_by_activity_id( $_POST['comment_id'] ) ) {
-                echo '-1<div class="error"><p>' . __( 'There was a problem deleting that comment. Please try again.', 'buddypress' ) . '</p></div>';
+        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete_by_activity_id( $_POST['id'] ) ) {
+                echo '-1<div class="error"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>';
                 return false;
         }
@@ -161 +161 @@
         return true;
 }
-add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity_comment' );
+add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity' );
+add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
 
 function bp_dtheme_activity_loop( $type = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {

trunk/bp-themes/bp-default/_inc/global.js

@@ -180 +180 @@
                                 if ( 'activity-favorites' == j( 'div.item-list-tabs li.selected').attr('id') )
                                         target.parent().parent().parent().slideUp(100);
+                        });
+
+                        return false;
+                }
+
+                /* Delete activity stream items */
+                if ( target.hasClass('delete-activity') ) {
+                        var li = target.parents('div.activity ul li');
+                        var id = li.attr('id').substr( 9, li.attr('id').length );
+                        var link_href = target.attr('href');
+
+                        var nonce = link_href.split('_wpnonce=');
+                                nonce = nonce[1];
+
+                        target.addClass('loading');
+
+                        j.post( ajaxurl, {
+                                action: 'delete_activity',
+                                'cookie': encodeURIComponent(document.cookie),
+                                'id': id,
+                                '_wpnonce': nonce
+                        },
+                        function(response) {
+                                target.removeClass('loading');
+
+                                if ( response[0] + response[1] == '-1' ) {
+                                        li.prepend( response.substr( 2, response.length ) );
+                                        li.children('div#message').hide().fadeIn(200);
+                                } else {
+                                        li.slideUp(200);
+                                }
                         });
 
@@ -396 +427 @@
 
                         j.post( ajaxurl, {
-                                action: 'delete_activity_comment',
+                                action: 'delete_activity',
                                 'cookie': encodeURIComponent(document.cookie),
                                 '_wpnonce': nonce,
-                                'comment_id': comment_id
+                                'id': comment_id
                         },
                         function(response)