Ticket #8648: 8648.patch

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

@@ -1 +1 @@
 /* global wp, BP_Nouveau, _, Backbone, tinymce, tinyMCE */
 /* jshint devel: true */
 /* @since 3.0.0 */
-/* @version 8.0.0 */
+/* @version 10.2.0 */
 window.wp = window.wp || {};
 window.bp = window.bp || {};
 
@@ -97 +97 @@
                         } );
                 },
 
+                updateNav: function( view ) {
+                        var currentView = this.box;
+
+                        if ( view ) {
+                                currentView = view;
+                        }
+
+                        // Activate the appropriate nav.
+                        $( '#subnav ul li' ).each( function( l, li ) {
+                                $( li ).removeClass( 'current selected' );
+                        } );
+
+                        $( '#subnav a#' + currentView ).closest( 'li' ).addClass( 'current selected' );
+                },
+
                 removeTinyMCE: function() {
                         if ( typeof tinymce !== 'undefined' ) {
                                 var editor = tinymce.get( 'message_content' );
@@ -169 +184 @@
                 composeView: function() {
                         // Remove all existing views.
                         this.clearViews();
+                        this.updateNav( 'compose' );
 
                         // Create the loop view.
                         var form = new bp.Views.messageForm( {
@@ -181 +197 @@
                 },
 
                 threadsView: function() {
-                        // Activate the appropriate nav.
-                        $( '#subnav ul li' ).each( function( l, li ) {
-                                $( li ).removeClass( 'current selected' );
-                        } );
-                        $( '#subnav a#' + this.box ).closest( 'li' ).addClass( 'current selected' );
+                        this.updateNav();
 
                         // Create the loop view.
                         var threads_list = new bp.Views.userThreads( { collection: this.threads, box: this.box } );