Changeset 12142

Timestamp:

05/28/2018 05:37:38 PM (8 years ago)

Author:

imath

Message:

Messages: catch Legacy hooks to customize the Active conversation box.

In order to preserve in the BP Nouveau Messages UI the level of PHP customization that developers are used to get in Legacy using do_action hooks, The content generated for the following hooks will be caught during Ajax requests and added as new properties of their JSON replies:

• bp_before_message_meta
• bp_after_message_meta
• bp_messages_inbox_list_item
• bp_messages_thread_options

About the bp_messages_inbox_list_item hook: as the Messages UI of BP Nouveau, unlike Legacy, is not using a table tag to display the list of messages received/starred/sent. All extra actions about messages into these loop views are done within the Active conversation box (eg: star/unstar). To inject the content of this specific hook, we are adding a table element under the message content preview as the expected output is a td tag.

Fixes #7851 (Branch 3.0)

Location:

branches/3.0/src/bp-templates/bp-nouveau

Files:

• buddypress/common/js-templates/messages/index.php (modified) (8 diffs)
• includes/messages/ajax.php (modified) (5 diffs)

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

@@ -176 +176 @@
     <# if ( undefined !== data.content ) { #>
 
-        <h2 class="message-title preview-thread-title"><?php esc_html_e( 'Active conversation:', 'buddypress' ); ?><span class="messages-title"> <# print( data.subject ); #></span></h2>
+        <h2 class="message-title preview-thread-title"><?php esc_html_e( 'Active conversation:', 'buddypress' ); ?><span class="messages-title">{{{data.subject}}}</span></h2>
         <div class="preview-content">
             <header class="preview-pane-header">
@@ -216 +216 @@
                         <span class="bp-screen-reader-text"><?php esc_html_e( 'View full conversation and reply.', 'buddypress' ); ?></span>
                     </a>
+
+                    <# if ( data.threadOptions ) { #>
+                        <span class="bp-messages-hook thread-options">
+                            {{{data.threadOptions}}}
+                        </span>
+                    <# } #>
                 </div>
             </header>
 
             <div class='preview-message'>
-                <# print( data.content ) #>
+                {{{data.content}}}
             </div>
+
+            <# if ( data.inboxListItem ) { #>
+                <table class="bp-messages-hook inbox-list-item">
+                    <tbody>
+                        <tr>{{{data.inboxListItem}}}</tr>
+                    </tbody>
+                </table>
+            <# } #>
         </div>
     <# } #>
@@ -227 +241 @@
 
 <script type="text/html" id="tmpl-bp-messages-single-header">
-    <h2 id="message-subject" class="message-title single-thread-title"><# print( data.subject ); #></h2>
+    <h2 id="message-subject" class="message-title single-thread-title">{{{data.subject}}}</h2>
     <header class="single-message-thread-header">
         <# if ( undefined !== data.recipients ) { #>
@@ -243 +257 @@
 
         <div class="actions">
-
             <button type="button" class="message-action-delete bp-tooltip bp-icons" data-bp-action="delete" data-bp-tooltip="<?php esc_attr_e( 'Delete conversation.', 'buddypress' ); ?>">
                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' ); ?></span>
             </button>
-
-            <?php bp_nouveau_messages_hook( 'after', 'thread_header_actions' ); ?>
         </div>
     </header>
@@ -255 +266 @@
 <script type="text/html" id="tmpl-bp-messages-single-list">
     <div class="message-metadata">
-        <?php bp_nouveau_messages_hook( 'before', 'meta' ); ?>
+        <# if ( data.beforeMeta ) { #>
+            <div class="bp-messages-hook before-message-meta">{{{data.beforeMeta}}}</div>
+        <# } #>
 
         <a href="{{data.sender_link}}" class="user-link">
@@ -278 +291 @@
         </div>
 
-        <?php bp_nouveau_messages_hook( 'after', 'meta' ); ?>
-
+        <# if ( data.afterMeta ) { #>
+            <div class="bp-messages-hook after-message-meta">{{{data.afterMeta}}}</div>
+        <# } #>
     </div>
 
@@ -311 +325 @@
             <div class="message-metadata">
 
-                <?php bp_nouveau_messages_hook( 'before', 'meta' ); ?>
+                <?php bp_nouveau_messages_hook( 'before', 'reply_meta' ); ?>
 
                 <div class="avatar-box">
@@ -319 +333 @@
                 </div>
 
-                <?php bp_nouveau_messages_hook( 'after', 'meta' ); ?>
+                <?php bp_nouveau_messages_hook( 'after', 'reply_meta' ); ?>
 
             </div><!-- .message-metadata -->

branches/3.0/src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -190 +190 @@
 
     $extra_content = bp_nouveau_messages_catch_hook_content( array(
+        'beforeMeta'    => 'bp_before_message_meta',
+        'afterMeta'     => 'bp_after_message_meta',
         'beforeContent' => 'bp_before_message_content',
         'afterContent'  => 'bp_after_message_content',
@@ -263 +265 @@
 
     while ( bp_message_threads() ) : bp_message_thread();
+        $last_message_id = (int) $messages_template->thread->last_message_id;
+
         $threads->threads[ $i ] = array(
             'id'            => bp_get_message_thread_id(),
-            'message_id'    => (int) $messages_template->thread->last_message_id,
+            'message_id'    => (int) $last_message_id,
             'subject'       => html_entity_decode( bp_get_message_thread_subject() ),
             'excerpt'       => html_entity_decode( bp_get_message_thread_excerpt() ),
@@ -314 +318 @@
 
             // Defaults to last
-            $sm_id = (int) $messages_template->thread->last_message_id;
+            $sm_id = $last_message_id;
 
             if ( $threads->threads[ $i ]['is_starred'] ) {
@@ -322 +326 @@
             $threads->threads[ $i ]['star_nonce'] = wp_create_nonce( 'bp-messages-star-' . $sm_id );
             $threads->threads[ $i ]['starred_id'] = $sm_id;
+        }
+
+        $thread_extra_content = bp_nouveau_messages_catch_hook_content( array(
+            'inboxListItem' => 'bp_messages_inbox_list_item',
+            'threadOptions' => 'bp_messages_thread_options',
+        ) );
+
+        if ( array_filter( $thread_extra_content ) ) {
+            $threads->threads[ $i ] = array_merge( $threads->threads[ $i ], $thread_extra_content );
         }
 
@@ -472 +485 @@
 
         $extra_content = bp_nouveau_messages_catch_hook_content( array(
+            'beforeMeta'    => 'bp_before_message_meta',
+            'afterMeta'     => 'bp_after_message_meta',
             'beforeContent' => 'bp_before_message_content',
             'afterContent'  => 'bp_after_message_content',