<!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][12358] trunk/src/bp-templates/bp-nouveau: BP Nouveau: Improve Activity Post Form backcompat with legacy hooks</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/12358">12358</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/12358","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>2019-03-14 05:37:11 +0000 (Thu, 14 Mar 2019)</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'>BP Nouveau: Improve Activity Post Form backcompat with legacy hooks

- Make sure the {{{bp_before_activity_post_form}}} hook is fired inside the form tag.
- Wrap action buttons and form options into the same container `#whats-new-options`.
- Make sure the {{{bp_activity_post_form_options}}} is fired inside this container.

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8065">#8065</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesactivityformphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/activity/form.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivityfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivitytemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressactivitypostformjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-activity-post-form.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesactivityformphp"></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/activity/form.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/activity/form.php        2019-03-12 20:25:20 UTC (rev 12357)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/activity/form.php  2019-03-14 05:37:11 UTC (rev 12358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,10 +2,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Activity Post form JS Templates
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.0.0
+ * @version 5.0.0
</ins><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">+<script type="text/html" id="tmpl-activity-before-post-form-inputs">
+       <?php bp_nouveau_activity_hook( 'before', 'post_form' ); ?>
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-activity-post-form-feedback">
</span><span class="cx" style="display: block; padding: 0 10px">        <span class="bp-icon" aria-hidden="true"></span><p>{{{data.message}}}</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesactivityfunctionsphp"></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/activity/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php 2019-03-12 20:25:20 UTC (rev 12357)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php   2019-03-14 05:37:11 UTC (rev 12358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Activity functions
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 5.0.0
</ins><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"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $activity_params = array(
</span><span class="cx" style="display: block; padding: 0 10px">                'user_id'     => bp_loggedin_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px">                'object'      => 'user',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'backcompat'  => (bool) has_action( 'bp_activity_post_form_options' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'backcompat'  => array(
+                       'before_post_form'  => (bool) has_action( 'bp_before_activity_post_form' ),
+                       'post_form_options' => (bool) has_action( 'bp_activity_post_form_options' ),
+               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 'post_nonce'  => wp_create_nonce( 'post_update', '_wpnonce_post_update' ),
</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="trunksrcbptemplatesbpnouveauincludesactivitytemplatetagsphp"></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/activity/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php     2019-03-12 20:25:20 UTC (rev 12357)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php       2019-03-14 05:37:11 UTC (rev 12358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Activity Template tags
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 5.0.0
</ins><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"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,18 +67,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Enqueue needed scripts for the Activity Post Form
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Move the `bp_before_activity_post_form` hook inside the Activity post form.
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_before_activity_post_form() {
</span><span class="cx" style="display: block; padding: 0 10px">        if ( bp_nouveau_current_user_can( 'publish_activity' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'bp-nouveau-activity-post-form' );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-       /**
-        * Fires before the activity post form.
-        *
-        * @since 1.2.0
-        */
-       do_action( 'bp_before_activity_post_form' );
</del><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></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressactivitypostformjs"></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/js/buddypress-activity-post-form.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-activity-post-form.js     2019-03-12 20:25:20 UTC (rev 12357)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-activity-post-form.js       2019-03-14 05:37:11 UTC (rev 12358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global bp, BP_Nouveau, _, Backbone */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* @version 3.1.0 */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @since 3.0.0 */
+/* @version 5.0.0 */
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px"> window.bp = window.bp || {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,6 +376,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                template : bp.template( 'activity-post-form-options' )
</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">+        bp.Views.BeforeFormInputs = bp.View.extend( {
+               tagName  : 'div',
+               template : bp.template( 'activity-before-post-form-inputs' )
+       } );
+
</ins><span class="cx" style="display: block; padding: 0 10px">         bp.Views.FormTarget = bp.View.extend( {
</span><span class="cx" style="display: block; padding: 0 10px">                tagName   : 'div',
</span><span class="cx" style="display: block; padding: 0 10px">                id        : 'whats-new-post-in-box',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,24 +592,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                BP_Nouveau.activity.params,
</span><span class="cx" style="display: block; padding: 0 10px">                                ['user_id', 'item_id', 'object' ]
</span><span class="cx" style="display: block; padding: 0 10px">                        ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        this.options.backcompat = BP_Nouveau.activity.params.backcompat;
+                       var staticViews = [
+                               new bp.Views.FormAvatar(),
+                               new bp.Views.FormContent( { activity: this.model } )
+                       ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // Backcompat to take the `bp_before_activity_post_form` action in account.
+                       if ( true === this.options.backcompat.before_post_form ) {
+                               staticViews.unshift( new bp.Views.BeforeFormInputs() );
+                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         // Clone the model to set the resetted one
</span><span class="cx" style="display: block; padding: 0 10px">                        this.resetModel = this.model.clone();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.views.set( [
-                               new bp.Views.FormAvatar(),
-                               new bp.Views.FormContent( { activity: this.model } )
-                       ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.views.set( staticViews );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        this.model.on( 'change:errors', this.displayFeedback, this );
</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">                displayFull: function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        var numStaticViews = true === this.options.backcompat.before_post_form ? 3 : 2;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Remove feedback.
</span><span class="cx" style="display: block; padding: 0 10px">                        this.cleanFeedback();
</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 ( 2 !== this.views._views[''].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( numStaticViews !== this.views._views[''].length ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 return;
</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">@@ -612,9 +626,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                height : 'auto'
</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">-                        // Backcompat custom fields
-                       if ( true === BP_Nouveau.activity.params.backcompat ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Add the container view for buttons or custom fields.
+                       if ( true === this.options.backcompat.post_form_options ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 this.views.add( new bp.Views.FormOptions( { model: this.model } ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        } else {
+                               this.views.add( new bp.View( { id: 'whats-new-options' } ) );
</ins><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">                        // Attach buttons
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,20 +637,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! _.isUndefined( BP_Nouveau.activity.params.buttons ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                // Global
</span><span class="cx" style="display: block; padding: 0 10px">                                bp.Nouveau.Activity.postForm.buttons.set( BP_Nouveau.activity.params.buttons );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.views.add( new bp.Views.FormButtons( { collection: bp.Nouveau.Activity.postForm.buttons, model: this.model } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         this.views.add( '#whats-new-options', new bp.Views.FormButtons( { collection: bp.Nouveau.Activity.postForm.buttons, model: this.model } ) );
</ins><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">                        // Select box for the object
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! _.isUndefined( BP_Nouveau.activity.params.objects ) && 1 < _.keys( BP_Nouveau.activity.params.objects ).length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.views.add( new bp.Views.FormTarget( { model: this.model } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         this.views.add( '#whats-new-options', new bp.Views.FormTarget( { model: this.model } ) );
</ins><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">-                        this.views.add( new bp.Views.FormSubmit( { model: this.model } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.views.add( '#whats-new-options', new bp.Views.FormSubmit( { model: this.model } ) );
</ins><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">                resetForm: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        var self = this, indexStaticViews = self.options.backcompat.before_post_form ? 2 : 1;
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         _.each( this.views._views[''], function( view, index ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( index > 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( index > indexStaticViews ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         view.remove();
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        } );
</span></span></pre>
</div>
</div>

</body>
</html>