<!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][12134] branches/3.0/src/bp-templates/bp-nouveau: Messages UI: Create a new Backbone view to wrap hooks caught output</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/12134">12134</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/12134","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-26 12:49:25 +0000 (Sat, 26 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 UI: Create a new Backbone view to wrap hooks caught output
This new view can be used when hooks caught output cannot be inserted into regular views. {{{bp_before_member_messages_loop}}} and {{{bp_before_member_messages_loop}}} are two good examples.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7850">#7850</a> (Branch 3.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30srcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp">branches/3.0/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveauincludesmessagesajaxphp">branches/3.0/src/bp-templates/bp-nouveau/includes/messages/ajax.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaujsbuddypressmessagesjs">branches/3.0/src/bp-templates/bp-nouveau/js/buddypress-messages.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30srcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/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">--- branches/3.0/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-05-26 12:47:08 UTC (rev 12133)
+++ branches/3.0/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-05-26 12:49:25 UTC (rev 12134)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * This view is used to inject hooks buffer
+ */
+?>
+<script type="text/html" id="tmpl-bp-messages-hook">
+ {{{data.extraContent}}}
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-messages-form">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_messages_hook( 'before', 'compose_content' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveauincludesmessagesajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/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">--- branches/3.0/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2018-05-26 12:47:08 UTC (rev 12133)
+++ branches/3.0/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2018-05-26 12:49:25 UTC (rev 12134)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,15 +223,24 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_POST['box'] ) && 'starred' === $_POST['box'] ) {
- $star_filter = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
+ $reset_action = $bp->current_action;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the message thread filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Override bp_current_action().
+ if ( isset( $_POST['box'] ) ) {
+ $bp->current_action = $_POST['box'];
+ }
+
+ // Add the message thread filter.
+ if ( 'starred' === $bp->current_action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
</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"> // Simulate the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_has_message_threads( bp_ajax_querystring( 'messages' ) ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the bp_current_action() override.
+ $bp->current_action = $reset_action;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feedback' => __( 'Sorry, no messages were found.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'info'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,8 +247,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $star_filter ) ) {
- // remove the message thread filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // remove the message thread filter.
+ if ( 'starred' === $bp->current_action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +328,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $threads->threads = array_filter( $threads->threads );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $extra_content = bp_nouveau_messages_catch_hook_content( array(
+ 'beforeLoop' => 'bp_before_member_messages_loop',
+ 'afterLoop' => 'bp_after_member_messages_loop',
+ ) );
+
+ if ( array_filter( $extra_content ) ) {
+ $threads->extraContent = $extra_content;
+ }
+
+ // Remove the bp_current_action() override.
+ $bp->current_action = $reset_action;
+
+ // Return the successfull reply.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( $threads );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaujsbuddypressmessagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/js/buddypress-messages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2018-05-26 12:47:08 UTC (rev 12133)
+++ branches/3.0/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2018-05-26 12:49:25 UTC (rev 12134)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,6 +354,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.options.box = bp.Nouveau.Messages.box;
</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">+ if ( ! _.isUndefined( resp.extraContent ) ) {
+ _.extend( this.options, _.pick( resp.extraContent, [
+ 'beforeLoop',
+ 'afterLoop'
+ ] ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return resp.threads;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,6 +473,24 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hook view
+ bp.Views.Hook = bp.Nouveau.Messages.View.extend( {
+ tagName: 'div',
+ template : bp.template( 'bp-messages-hook' ),
+
+ initialize: function() {
+ this.model = new Backbone.Model( {
+ extraContent: this.options.extraContent
+ } );
+
+ this.el.className = 'bp-messages-hook';
+
+ if ( this.options.className ) {
+ this.el.className += ' ' + this.options.className;
+ }
+ }
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.Views.messageEditor = bp.Nouveau.Messages.View.extend( {
</span><span class="cx" style="display: block; padding: 0 10px"> template : bp.template( 'bp-messages-editor' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,11 +667,14 @@
</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"> initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the threads parent view
- this.views.add( new bp.Nouveau.Messages.View( { tagName: 'ul', id: 'message-threads', className: 'message-lists' } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var Views = [
+ new bp.Nouveau.Messages.View( { tagName: 'ul', id: 'message-threads', className: 'message-lists' } ),
+ new bp.Views.previewThread( { collection: this.collection } )
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the preview Active Thread view
- this.views.add( new bp.Views.previewThread( { collection: this.collection } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( Views, function( view ) {
+ this.views.add( view );
+ }, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load threads for the active view
</span><span class="cx" style="display: block; padding: 0 10px"> this.requestThreads();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,7 +690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.collection.fetch( {
</span><span class="cx" style="display: block; padding: 0 10px"> data : _.pick( this.options, 'box' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- success : this.threadsFetched,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ success : _.bind( this.threadsFetched, this ),
</ins><span class="cx" style="display: block; padding: 0 10px"> error : this.threadsFetchError
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,6 +698,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> threadsFetched: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.removeFeedback();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display the bp_after_member_messages_loop hook.
+ if ( this.collection.options.afterLoop ) {
+ this.views.add( new bp.Views.Hook( { extraContent: this.collection.options.afterLoop, className: 'after-messages-loop' } ), { at: 1 } );
+ }
+
+ // Display the bp_before_member_messages_loop hook.
+ if ( this.collection.options.beforeLoop ) {
+ this.views.add( new bp.Views.Hook( { extraContent: this.collection.options.beforeLoop, className: 'before-messages-loop' } ), { at: 0 } );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Inform the user about how to use the UI.
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.displayFeedback( BP_Nouveau.messages.howto, 'info' );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>