Ticket #7840: 7840.patch

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

@@ -77 +77 @@
         add_filter( 'tiny_mce_before_init', 'bp_nouveau_messages_at_on_tinymce_init', 10, 2 );
 }
 
+/**
+ * Should the Private Messages UI be used as a Single Page Application?
+ *
+ * @since  3.0.1
+ *
+ * @return boolean True to use as a SPA. False otherwise.
+ */
+function bp_nouveau_messages_is_spa() {
+        /**
+         * Filter here to use Private messages as a Single Page Application
+         * by returning true.
+         *
+         * Some plugins functionality may not work as expected in this case.
+         *
+         * @param boolean $value True to use as a SPA. False otherwise.
+         *                       Default false.
+         */
+        return (bool) apply_filters( 'bp_nouveau_messages_is_spa', false );
+}
+
 /**
  * Localize the strings needed for the messages UI
  *
@@ -114 +134 @@
                         'one'  => __( '(and 1 other)', 'buddypress' ),
                         'more' => __( '(and %d others)', 'buddypress' ),
                 ),
+                'isSpa'   => bp_nouveau_messages_is_spa(),
+                'rootUrl' => trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ),
         );
 
         // Star private messages.
@@ -179 +201 @@
                 if ( 'notices' === $secondary_nav_item->slug ) {
                         bp_core_remove_subnav_item( bp_get_messages_slug(), $secondary_nav_item->slug, 'members' );
                 } else {
-                        $params = array( 'link' => '#' . $secondary_nav_item->slug );
+                        if ( bp_nouveau_messages_is_spa() ) {
+                                $params = array( 'link' => '#' . $secondary_nav_item->slug );
+                        } else {
+                                $params = array( 'link' => $secondary_nav_item->link . '#' . $secondary_nav_item->slug );
+                        }
 
                         // Make sure Admins won't write a messages from the user's account.
                         if ( 'compose' === $secondary_nav_item->slug ) {
@@ -208 +234 @@
                         if ( 'notices' === $nav_id ) {
                                 $admin_nav[ $nav_iterator ]['href'] = esc_url( add_query_arg( array( 'page' => 'bp-notices' ), bp_get_admin_url( 'users.php' ) ) );
                         } else {
-                                $admin_nav[ $nav_iterator ]['href'] = $user_messages_link . '#' . trim( $nav_id );
+                                if ( bp_nouveau_messages_is_spa() ) {
+                                        $admin_nav[ $nav_iterator ]['href'] = $user_messages_link . '#' . trim( $nav_id );
+                                } else {
+                                        $admin_nav[ $nav_iterator ]['href'] .= '#' . trim( $nav_id );
+                                }
                         }
                 }
         }

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

@@ -73 +73 @@
 
                                         // Otherwise load it
                                         } else {
-                                                self.router.navigate( 'compose', { trigger: true } );
+                                                self.routeUrl( 'compose' );
                                         }
 
                                 // Other views are classic.
@@ -82 +82 @@
                                         if ( self.box !== view_id || ! _.isUndefined( self.views.get( 'compose' ) ) ) {
                                                 self.clearViews();
 
-                                                self.router.navigate( view_id, { trigger: true } );
+                                                self.routeUrl( view_id );
                                         }
                                 }
                         } );
@@ -215 +215 @@
                         this.views.add( { id: 'single', view: single_thread } );
 
                         single_thread.inject( '.bp-messages-content' );
+                },
+
+                /**
+                 * Uses the Single Page Application route or opens an URL.
+                 *
+                 * @param  {string} slug The URL slug to root the User to.
+                 * @return {void}
+                 */
+                routeUrl: function( slug ) {
+                        if ( BP_Nouveau.messages.isSpa ) {
+                                this.router.navigate( slug, { trigger: true } );
+                        } else {
+                                window.location.href = BP_Nouveau.messages.rootUrl + slug + '/#' + slug;
+                        }
                 }
         };
 
@@ -616 +630 @@
                                 form.get( 'view' ).remove();
                                 bp.Nouveau.Messages.views.remove( { id: 'compose', view: form } );
 
-                                bp.Nouveau.Messages.router.navigate( 'sentbox', { trigger: true } );
+                                bp.Nouveau.Messages.routeUrl( 'sentbox' );
                         } ).fail( function( response ) {
                                 if ( response.feedback ) {
                                         bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
@@ -726 +740 @@
                 loadSingleView: function( event ) {
                         event.preventDefault();
 
-                        bp.Nouveau.Messages.router.navigate(
-                                'view/' + $( event.currentTarget ).closest( '.thread-content' ).data( 'thread-id' ),
-                                { trigger: true }
+                        bp.Nouveau.Messages.routeUrl(
+                                'view/' + $( event.currentTarget ).closest( '.thread-content' ).data( 'thread-id' )
                         );
                 }
         } );