Ticket #7626: 7726.patch

src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -98 +98 @@
                 'nonces' => array(
                         'send' => wp_create_nonce( 'messages_send_message' ),
                 ),
-                'loading' => __( 'Loading messages. Please wait.', 'buddypress' ),
-                'bulk_actions' => bp_nouveau_messages_get_bulk_actions(),
+                'loading'       => __( 'Loading messages. Please wait.', 'buddypress' ),
+                'doingAction'   => array(
+                        'read'   => __( 'Marking message(s) as read. Please wait.', 'buddypress' ),
+                        'unread' => __( 'Marking message(s) as unread. Please wait.', 'buddypress' ),
+                        'delete' => __( 'Deleiing message(s). Please wait.', 'buddypress' ),
+                        'star'   => __( 'Starring message(s). Please wait.', 'buddypress' ),
+                        'unstar' => __( 'Unstarring message(s). Please wait.', 'buddypress' ),
+                ),
+                'bulk_actions'  => bp_nouveau_messages_get_bulk_actions(),
         );
 
         // Star private messages.

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

@@ -850 +850 @@
                 },
 
                 doAction: function( event ) {
-                        var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {}, mid;
+                        var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {}, mid,
+                            feedback = BP_Nouveau.messages.doingAction;
 
                         if ( ! action ) {
                                 return event;
@@ -874 +875 @@
                                 mid = model.get( 'starred_id' );
                         }
 
+                        if ( ! _.isUndefined( feedback[ action ] ) ) {
+                                bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+                        }
+
                         this.collection.doAction( action, mid, options ).done( function( response ) {
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
 
                                 if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
@@ -895 +903 @@
                                         model.set( _.first( response.messages ) );
                                 }
                         } ).fail( function( response ) {
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
                         } );
                 }
@@ -931 +942 @@
 
                 doBulkAction: function( event ) {
                         var self = this, options = {}, ids, attr = 'id';
+                            feedback = BP_Nouveau.messages.doingAction;
 
                         event.preventDefault();
 
@@ -969 +981 @@
                             return [model.get( attr ), model.get( 'id' )];
                         } ) );
 
+                        if ( ! _.isUndefined( feedback[ action ] ) ) {
+                                bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+                        }
+
                         this.collection.doAction( action, ids, options ).done( function( response ) {
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
 
                                 if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
@@ -988 +1007 @@
                                         } );
                                 }
                         } ).fail( function( response ) {
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
                         } );
                 }
@@ -1088 +1110 @@
 
                 doAction: function( event ) {
                         var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {};
+                            feedback = BP_Nouveau.messages.doingAction;
 
                         if ( ! action ) {
                                 return event;
@@ -1114 +1137 @@
 
                         }
 
+                        if ( ! _.isUndefined( feedback[ action ] ) ) {
+                                bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+                        }
+
                         bp.Nouveau.Messages.threads.doAction( action, this.model.get( 'id' ), options ).done( function( response ) {
                                 // Remove all views
                                 if ( 'delete' === action ) {
@@ -1122 +1149 @@
                                         self.model.set( _.first( response.messages ) );
                                 }
 
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 // Display the feedback
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
                         } ).fail( function( response ) {
+                                // Remove previous feedback.
+                                bp.Nouveau.Messages.removeFeedback();
+
                                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
                         } );
                 }