Ticket #7723: 7723.patch

src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

@@ -9 +9 @@
  */
 ?>
 <div class="subnav-filters filters user-subnav bp-messages-filters" id="subsubnav"></div>
-<div class="bp-messages-content"></div>
 <div class="bp-messages-feedback"></div>
+<div class="bp-messages-content"></div>
 
 <script type="text/html" id="tmpl-bp-messages-form">
         <?php bp_nouveau_messages_hook( 'before', 'compose_content' ); ?>
@@ -227 +227 @@
 
                 <div class="actions">
                         <# if ( undefined !== data.star_link ) { #>
-
-                                <?php $test = 1; ?>
-
-                                <# if ( false !== data.is_starred ) { #>
-                                        <button type="button" class="message-action-unstar bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="unstar" data-bp-tooltip="<?php esc_attr_e( 'Unstar Message', 'buddypress' ); ?>">
-                                                <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Message', 'buddypress' ); ?></span>
-                                        </button>
-                                <# } else { #>
-                                        <button type="button" class="message-action-star bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="star" data-bp-tooltip="<?php esc_attr_e( 'Star Message', 'buddypress' ); ?>">
-                                                <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Message', 'buddypress' ); ?></span>
-                                        </button>
-                                <# } #>
-
+                                <button type="button" class="message-action-unstar bp-tooltip bp-icons <# if ( false === data.is_starred ) { #>bp-hide<# } #>" data-bp-star-link="{{data.star_link}}" data-bp-action="unstar" data-bp-tooltip="<?php esc_attr_e( 'Unstar Message', 'buddypress' ); ?>">
+                                        <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Message', 'buddypress' ); ?></span>
+                                </button>
+                                <button type="button" class="message-action-star bp-tooltip bp-icons <# if ( false !== data.is_starred ) { #>bp-hide<# } #>" data-bp-star-link="{{data.star_link}}" data-bp-action="star" data-bp-tooltip="<?php esc_attr_e( 'Star Message', 'buddypress' ); ?>">
+                                        <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Message', 'buddypress' ); ?></span>
+                                </button>
                         <# } #>
                 </div>
 

src/bp-templates/bp-nouveau/css/buddypress.css

@@ -3024 +3024 @@
         max-width: 30%;
 }
 
-.bp-messages-content .actions .bp-icons {
+.bp-messages-content .actions .bp-icons:not(.bp-hide) {
         display: inline-block;
         margin: 0;
         padding: 0.3em 0.5em;
@@ -3073 +3073 @@
         -webkit-box-shadow: -2px 1px 9px 0 #eee;
         -moz-box-shadow: -2px 1px 9px 0 #eee;
         box-shadow: -2px 1px 9px 0 #eee;
-        overflow: hidden;
+        display: table;
+        width: 100%;
         padding: 0.2em;
 }
 

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

@@ -1104 +1104 @@
                         }
 
                         if ( 'star' === action || 'unstar' === action ) {
+                                var opposite = {
+                                        'star': 'unstar',
+                                        'unstar': 'star',
+                                };
+
                                 options.data = {
                                         'star_nonce' : this.model.get( 'star_nonce' )
                                 };
+
+                                $( event.currentTarget ).addClass( 'bp-hide' );
+                                $( event.currentTarget ).parent().find( '[data-bp-action="' + opposite[ action ] + '"]' ).removeClass( 'bp-hide' );
                         }
 
                         bp.Nouveau.Messages.threads.doAction( action, this.model.get( 'id' ), options ).done( function( response ) {