<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12071] trunk/src/bp-templates/bp-nouveau: BP Nouveau-Messages UI: ask the user to wait until bulk action is done</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12071">12071</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12071","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-09 14:10:13 +0000 (Wed, 09 May 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP Nouveau-Messages UI: ask the user to wait until bulk action is done
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7626">#7626</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressmessagesjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2018-05-09 12:10:37 UTC (rev 12070)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2018-05-09 14:10:13 UTC (rev 12071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,8 +98,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonces' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'send' => wp_create_nonce( 'messages_send_message' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'loading' => __( 'Loading messages. Please wait.', 'buddypress' ),
- 'bulk_actions' => bp_nouveau_messages_get_bulk_actions(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '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(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Star private messages.
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressmessagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2018-05-09 12:10:37 UTC (rev 12070)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2018-05-09 14:10:13 UTC (rev 12071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,7 +850,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> doAction: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {}, mid;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {}, mid,
+ feedback = BP_Nouveau.messages.doingAction;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return event;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +875,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mid = model.get( 'starred_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! _.isUndefined( feedback[ action ] ) ) {
+ bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.collection.doAction( action, mid, options ).done( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,6 +903,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> model.set( _.first( response.messages ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } ).fail( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,7 +941,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> doBulkAction: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var self = this, options = {}, ids, attr = 'id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this, options = {}, ids, attr = 'id',
+ feedback = BP_Nouveau.messages.doingAction;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,7 +981,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return [model.get( attr ), model.get( 'id' )];
</span><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! _.isUndefined( feedback[ action ] ) ) {
+ bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.collection.doAction( action, ids, options ).done( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,6 +1007,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } ).fail( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1087,7 +1109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> doAction: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var action = $( event.currentTarget ).data( 'bp-action' ), self = this, options = {},
+ feedback = BP_Nouveau.messages.doingAction;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return event;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,6 +1137,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! _.isUndefined( feedback[ action ] ) ) {
+ bp.Nouveau.Messages.displayFeedback( feedback[ action ], 'loading' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.threads.doAction( action, this.model.get( 'id' ), options ).done( function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove all views
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'delete' === action ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1122,9 +1149,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self.model.set( _.first( response.messages ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Display the feedback
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px"> } ).fail( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous feedback.
+ bp.Nouveau.Messages.removeFeedback();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>