Changeset 12941

Timestamp:

05/01/2021 11:58:20 AM (5 years ago)

Author:

imath

Message:

Nouveau: only handle Messages supported views with the Backbone router

When an unsupported view is generated by a plugin (eg: adding a new Messages Component sub nav item), it is skipped by the Backbone router and the link attached to it is loaded the traditional way on click. If the current screen has been added by a plugin, the sub nav click handler also leaves the event loads the page traditionally.

Props Venutius

Fixes #8430

File:

• trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js (modified) (5 diffs)

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

@@ -1 +1 @@
 /* global wp, BP_Nouveau, _, Backbone, tinymce, tinyMCE */
 /* jshint devel: true */
-/* @version 3.1.0 */
+/* @since 3.0.0 */
+/* @version 8.0.0 */
 window.wp = window.wp || {};
 window.bp = window.bp || {};
@@ -52 +53 @@
                         // Then listen to nav click and load the appropriate view.
                         $( '#subnav a' ).on( 'click', function( event ) {
+                                var view_id = $( event.target ).prop( 'id' ),
+                                    supportedView = [ 'inbox', 'starred', 'sentbox', 'compose' ];
+
+                                if ( -1 === _.indexOf( supportedView, view_id ) || 'unsupported' === self.box ) {
+                                        return event;
+                                }
+
                                 event.preventDefault();
-
-                                var view_id = $( event.target ).prop( 'id' );
 
                                 // Remove the editor to be sure it will be added dynamically later.
@@ -603 +609 @@
                                                 } else {
                                                         usernames = usernames.map( function( username ) {
-                                                                username = $.trim( username );
+                                                                username = username.trim();
                                                                 return username;
                                                         } );
 
-                                                        if ( ! usernames || ! $.isArray( usernames ) ) {
+                                                        if ( ! usernames || ! _.isArray( usernames ) ) {
                                                                 errors.push( 'send_to' );
                                                         }
@@ -1383 +1389 @@
         bp.Nouveau.Messages.Router = Backbone.Router.extend( {
                 routes: {
-                        'compose/' : 'composeMessage',
-                        'view/:id/': 'viewMessage',
-                        'sentbox/' : 'sentboxView',
-                        'starred/' : 'starredView',
-                        'inbox/'   : 'inboxView',
-                        ''        : 'inboxView'
+                        'compose/'    : 'composeMessage',
+                        'view/:id/'   : 'viewMessage',
+                        'sentbox/'    : 'sentboxView',
+                        'starred/'    : 'starredView',
+                        'inbox/'      : 'inboxView',
+                        ''            : 'inboxView',
+                        '*unSupported': 'unSupported'
                 },
 
@@ -1421 +1428 @@
                 },
 
+                unSupported: function() {
+                        bp.Nouveau.Messages.box = 'unsupported';
+                },
+
                 inboxView: function() {
                         bp.Nouveau.Messages.box = 'inbox';