Changeset 12358

Timestamp:

03/14/2019 05:37:11 AM (7 years ago)

Author:

imath

Message:

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 #8065

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/common/js-templates/activity/form.php (modified) (1 diff)
• includes/activity/functions.php (modified) (2 diffs)
• includes/activity/template-tags.php (modified) (3 diffs)
• js/buddypress-activity-post-form.js (modified) (6 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/activity/form.php

@@ -3 +3 @@
  * Activity Post form JS Templates
  *
- * @version 3.1.0
+ * @since 3.0.0
+ * @version 5.0.0
  */
 ?>
+
+<script type="text/html" id="tmpl-activity-before-post-form-inputs">
+        <?php bp_nouveau_activity_hook( 'before', 'post_form' ); ?>
+</script>
 
 <script type="text/html" id="tmpl-activity-post-form-feedback">

trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 5.0.0
  */
 
@@ -68 +68 @@
                 'user_id'     => bp_loggedin_user_id(),
                 'object'      => 'user',
-                'backcompat'  => (bool) has_action( 'bp_activity_post_form_options' ),
+                'backcompat'  => array(
+                        'before_post_form'  => (bool) has_action( 'bp_before_activity_post_form' ),
+                        'post_form_options' => (bool) has_action( 'bp_activity_post_form_options' ),
+                ),
                 'post_nonce'  => wp_create_nonce( 'post_update', '_wpnonce_post_update' ),
         );

trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 5.0.0
  */
 
@@ -68 +68 @@
  *
  * @since 3.0.0
+ * @since 5.0.0 Move the `bp_before_activity_post_form` hook inside the Activity post form.
  */
 function bp_nouveau_before_activity_post_form() {
@@ -73 +74 @@
                 wp_enqueue_script( 'bp-nouveau-activity-post-form' );
         }
-
-        /**
-         * Fires before the activity post form.
-         *
-         * @since 1.2.0
-         */
-        do_action( 'bp_before_activity_post_form' );
 }
 

trunk/src/bp-templates/bp-nouveau/js/buddypress-activity-post-form.js

@@ -1 +1 @@
 /* global bp, BP_Nouveau, _, Backbone */
-/* @version 3.1.0 */
+/* @since 3.0.0 */
+/* @version 5.0.0 */
 window.wp = window.wp || {};
 window.bp = window.bp || {};
@@ -376 +377 @@
         } );
 
+        bp.Views.BeforeFormInputs = bp.View.extend( {
+                tagName  : 'div',
+                template : bp.template( 'activity-before-post-form-inputs' )
+        } );
+
         bp.Views.FormTarget = bp.View.extend( {
                 tagName   : 'div',
@@ -587 +593 @@
                                 ['user_id', 'item_id', 'object' ]
                         ) );
+                        this.options.backcompat = BP_Nouveau.activity.params.backcompat;
+                        var staticViews = [
+                                new bp.Views.FormAvatar(),
+                                new bp.Views.FormContent( { activity: this.model } )
+                        ];
+
+                        // 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() );
+                        }
 
                         // Clone the model to set the resetted one
                         this.resetModel = this.model.clone();
 
-                        this.views.set( [
-                                new bp.Views.FormAvatar(),
-                                new bp.Views.FormContent( { activity: this.model } )
-                        ] );
+                        this.views.set( staticViews );
 
                         this.model.on( 'change:errors', this.displayFeedback, this );
@@ -600 +613 @@
 
                 displayFull: function( event ) {
+                        var numStaticViews = true === this.options.backcompat.before_post_form ? 3 : 2;
 
                         // Remove feedback.
                         this.cleanFeedback();
 
-                        if ( 2 !== this.views._views[''].length ) {
+                        if ( numStaticViews !== this.views._views[''].length ) {
                                 return;
                         }
@@ -613 +627 @@
                         } );
 
-                        // Backcompat custom fields
-                        if ( true === BP_Nouveau.activity.params.backcompat ) {
+                        // Add the container view for buttons or custom fields.
+                        if ( true === this.options.backcompat.post_form_options ) {
                                 this.views.add( new bp.Views.FormOptions( { model: this.model } ) );
+                        } else {
+                                this.views.add( new bp.View( { id: 'whats-new-options' } ) );
                         }
 
@@ -622 +638 @@
                                 // Global
                                 bp.Nouveau.Activity.postForm.buttons.set( BP_Nouveau.activity.params.buttons );
-                                this.views.add( new bp.Views.FormButtons( { collection: bp.Nouveau.Activity.postForm.buttons, model: this.model } ) );
+                                this.views.add( '#whats-new-options', new bp.Views.FormButtons( { collection: bp.Nouveau.Activity.postForm.buttons, model: this.model } ) );
                         }
 
                         // Select box for the object
                         if ( ! _.isUndefined( BP_Nouveau.activity.params.objects ) && 1 < _.keys( BP_Nouveau.activity.params.objects ).length ) {
-                                this.views.add( new bp.Views.FormTarget( { model: this.model } ) );
-                        }
-
-                        this.views.add( new bp.Views.FormSubmit( { model: this.model } ) );
+                                this.views.add( '#whats-new-options', new bp.Views.FormTarget( { model: this.model } ) );
+                        }
+
+                        this.views.add( '#whats-new-options', new bp.Views.FormSubmit( { model: this.model } ) );
                 },
 
                 resetForm: function() {
+                        var self = this, indexStaticViews = self.options.backcompat.before_post_form ? 2 : 1;
+
                         _.each( this.views._views[''], function( view, index ) {
-                                if ( index > 1 ) {
+                                if ( index > indexStaticViews ) {
                                         view.remove();
                                 }