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

Timestamp:

05/24/2018 05:13:57 AM (8 years ago)

Author:

imath

Message:

BP Nouveau Messages UI: Improve the Backbone router using pushState

In order to be consistent with conditional template tags such as bp_is_messages_compose_screen(), the routes of the Backbone router have been updated to match Messages component canonical URLs

Props sbrajesh, djpaul

See #7840 (Trunk)

File:

• trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php (modified) (3 diffs)

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

@@ -115 +115 @@
                         'more' => __( '(and %d others)', 'buddypress' ),
                 ),
+                'rootUrl' => trailingslashit( str_replace( home_url(), '', bp_displayed_user_domain() ) . bp_get_messages_slug() ),
         );
 
@@ -179 +180 @@
                 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 );
-
-                        // Make sure Admins won't write a messages from the user's account.
-                        if ( 'compose' === $secondary_nav_item->slug ) {
-                                $params['user_has_access'] = bp_is_my_profile();
-                        }
-
-                        $bp->members->nav->edit_nav( $params, $secondary_nav_item->slug, bp_get_messages_slug() );
+                } elseif ( 'compose' === $secondary_nav_item->slug ) {
+                        $bp->members->nav->edit_nav( array(
+                                'user_has_access' => bp_is_my_profile()
+                        ), $secondary_nav_item->slug, bp_get_messages_slug() );
                 }
         }
@@ -205 +201 @@
                 $nav_id = str_replace( 'my-account-messages-', '', $nav['id'] );
 
-                if ( 'my-account-messages' !== $nav_id ) {
-                        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 ( 'notices' === $nav_id ) {
+                        $admin_nav[ $nav_iterator ]['href'] = esc_url( add_query_arg( array(
+                                'page' => 'bp-notices'
+                        ), bp_get_admin_url( 'users.php' ) ) );
                 }
         }