Changeset 12071

Timestamp:

05/09/2018 02:10:13 PM (7 years ago)

Author:

imath

Message:

BP Nouveau-Messages UI: ask the user to wait until bulk action is done

Fixes #7626

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• includes/messages/functions.php (modified) (1 diff)
• js/buddypress-messages.js (modified) (9 diffs)

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

@@ -99 +99 @@
             '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' => __( 'Deleting 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(),
     );
 

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

@@ -851 +851 @@
 
         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 ) {
@@ -875 +876 @@
             }
 
+            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 );
 
@@ -896 +904 @@
                 }
             } ).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';
+            var self = this, options = {}, ids, attr = 'id',
+                feedback = BP_Nouveau.messages.doingAction;
 
             event.preventDefault();
@@ -970 +982 @@
             } ) );
 
+            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 );
 
@@ -989 +1008 @@
                 }
             } ).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 = {};
+            var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {},
+                feedback = BP_Nouveau.messages.doingAction;
 
             if ( ! action ) {
@@ -1113 +1136 @@
                 $( event.currentTarget ).parent().find( '[data-bp-action="' + opposite[ action ] + '"]' ).removeClass( 'bp-hide' );
 
+            }
+
+            if ( ! _.isUndefined( feedback[ action ] ) ) {
+                bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
             }
 
@@ -1123 +1150 @@
                 }
 
+                // 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 );
             } );