<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12141] trunk/src/bp-templates/bp-nouveau: Messages: catch Legacy hooks to customize the Active conversation box.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12141">12141</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12141","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-28 17:34:41 +0000 (Mon, 28 May 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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.
See <a href="http://buddypress.trac.wordpress.org/ticket/7851">#7851</a> (Trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagesajaxphp">trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-05-28 16:58:24 UTC (rev 12140)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-05-28 17:34:41 UTC (rev 12141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-messages-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( undefined !== data.content ) { #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="message-title preview-thread-title"><?php esc_html_e( 'Active conversation:', 'buddypress' ); ?><span class="messages-title"> <# print( data.subject ); #></span></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="message-title preview-thread-title"><?php esc_html_e( 'Active conversation:', 'buddypress' ); ?><span class="messages-title">{{{data.subject}}}</span></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="preview-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="preview-pane-header">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,18 +215,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="../view/{{data.id}}/" class="message-action-view bp-tooltip bp-icons" data-bp-action="view" data-bp-tooltip="<?php esc_attr_e( 'View full conversation and reply.', 'buddypress' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="bp-screen-reader-text"><?php esc_html_e( 'View full conversation and reply.', 'buddypress' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <# if ( data.threadOptions ) { #>
+ <span class="bp-messages-hook thread-options">
+ {{{data.threadOptions}}}
+ </span>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class='preview-message'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# print( data.content ) #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ {{{data.content}}}
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <# if ( data.inboxListItem ) { #>
+ <table class="bp-messages-hook inbox-list-item">
+ <tbody>
+ <tr>{{{data.inboxListItem}}}</tr>
+ </tbody>
+ </table>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-messages-single-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 id="message-subject" class="message-title single-thread-title"><# print( data.subject ); #></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 id="message-subject" class="message-title single-thread-title">{{{data.subject}}}</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <header class="single-message-thread-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( undefined !== data.recipients ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <dl class="thread-participants">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,12 +256,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> <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><span class="cx" style="display: block; padding: 0 10px"> <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <?php bp_nouveau_messages_hook( 'after', 'thread_header_actions' ); ?>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +265,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-messages-single-list">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="message-metadata">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_nouveau_messages_hook( 'before', 'meta' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.beforeMeta ) { #>
+ <div class="bp-messages-hook before-message-meta">{{{data.beforeMeta}}}</div>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="{{data.sender_link}}" class="user-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="avatar" src="{{data.sender_avatar}}" alt="" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,8 +290,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_nouveau_messages_hook( 'after', 'meta' ); ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.afterMeta ) { #>
+ <div class="bp-messages-hook after-message-meta">{{{data.afterMeta}}}</div>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.beforeContent ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="message-box">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="message-metadata">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_nouveau_messages_hook( 'before', 'meta' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bp_nouveau_messages_hook( 'before', 'reply_meta' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="avatar-box">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php esc_html_e( 'Send a Reply', 'buddypress' ); ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_nouveau_messages_hook( 'after', 'meta' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bp_nouveau_messages_hook( 'after', 'reply_meta' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .message-metadata -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmessagesajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2018-05-28 16:58:24 UTC (rev 12140)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2018-05-28 17:34:41 UTC (rev 12141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,6 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_content = bp_nouveau_messages_catch_hook_content( array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'beforeMeta' => 'bp_before_message_meta',
+ 'afterMeta' => 'bp_after_message_meta',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'beforeContent' => 'bp_before_message_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'afterContent' => 'bp_after_message_content',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,9 +264,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( bp_message_threads() ) : bp_message_thread();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_message_id = (int) $messages_template->thread->last_message_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $threads->threads[ $i ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bp_get_message_thread_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message_id' => (int) $messages_template->thread->last_message_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message_id' => (int) $last_message_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subject' => html_entity_decode( bp_get_message_thread_subject() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt' => html_entity_decode( bp_get_message_thread_excerpt() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => html_entity_decode( do_shortcode( bp_get_message_thread_content() ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $threads->threads[ $i ]['is_starred'] = array_search( 'unstar', $star_link_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Defaults to last
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sm_id = (int) $messages_template->thread->last_message_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sm_id = $last_message_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $threads->threads[ $i ]['is_starred'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sm_id = (int) $star_link_data[ $threads->threads[ $i ]['is_starred'] + 1 ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,6 +327,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $threads->threads[ $i ]['starred_id'] = $sm_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $i += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> endwhile;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,6 +484,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_content = bp_nouveau_messages_catch_hook_content( array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'beforeMeta' => 'bp_before_message_meta',
+ 'afterMeta' => 'bp_after_message_meta',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'beforeContent' => 'bp_before_message_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'afterContent' => 'bp_after_message_content',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre>
</div>
</div>
</body>
</html>