Changeset 7148

Timestamp:

11/05/2020 05:06:10 PM (6 years ago)

Author:

johnjamesjacoby

Message:

Replies: fix clicking "Reply" link from the lead topic.

This commit adjusts reply.js and bbp_get_topic_reply_link() so clicking "Reply" from the lead topic now behaves similarly to clicking "Reply" from a reply. This includes support for hierarchical replies being on or off.

In trunk, for 2.7. Fixes #3385.

Location:

trunk/src

Files:

• includes/topics/template.php (modified) (2 diffs)
• templates/default/js/reply.js (modified) (1 diff)

trunk/src/includes/topics/template.php

@@ -2852 +2852 @@
                         'link_after'  => '',
                         'reply_text'  => esc_html_x( 'Reply', 'verb', 'bbpress' ),
+                        'add_below'   => 'post',
+                        'respond_id'  => 'new-reply-' . bbp_get_topic_id(),
                 ), 'get_topic_reply_link' );
 
@@ -2862 +2864 @@
                 }
 
-                // Add $uri to the array, to be passed through the filter
-                $r['uri'] = '#new-post';
-                $retval   = $r['link_before'] . '<a role="button" href="' . esc_url( $r['uri'] ) . '" class="bbp-topic-reply-link">' . $r['reply_text'] . '</a>' . $r['link_after'];
+                // Only add onclick if replies are threaded
+                $onclick = bbp_thread_replies()
+                        ? ' onclick="return addReply.cancelForm();"'
+                        : '';
+
+                // Add $uri to the array, to be passed through the filter
+                $r['uri'] = remove_query_arg( array( 'bbp_reply_to', '_wpnonce' ) ) . '#new-post';
+                $retval   = $r['link_before'] . '<a role="button" href="' . esc_url( $r['uri'] ) . '" class="bbp-topic-reply-link"' . $onclick . '>' . $r['reply_text'] . '</a>' . $r['link_after'];
 
                 // Filter & return

trunk/src/templates/default/js/reply.js

@@ -63 +63 @@
                  */
                 cancel.onclick = function () {
-                        var r       = addReply,
-                                temp    = r.getElement( 'bbp-temp-form-div' ),
-                                respond = r.getElement( r.respondId );
-
-                        r.removeEditor();
-
-                        if ( ! temp || ! respond ) {
-                                return;
-                        }
-
-                        r.getElement( 'bbp_reply_to' ).value = '0';
-
-                        temp.parentNode.insertBefore( respond, temp );
-                        temp.parentNode.removeChild( temp );
-
-                        this.style.display = 'none';
-                        this.onclick       = null;
-
-                        r.addEditor();
+                        t.cancelForm( this );
                 };
 
                 t.scrollToForm();
 
+                /* Prevent click from going through */
+                return false;
+        },
+
+        /**
+         * Cancel the reply form.
+         *
+         * @since 2.6.6
+         * @returns {void}
+         */
+        cancelForm: function () {
+                var r       = addReply,
+                        temp    = r.getElement( 'bbp-temp-form-div' ),
+                        cancel  = r.getElement( 'bbp-cancel-reply-to-link' ),
+                        respond = r.getElement( r.respondId );
+
+                r.removeEditor();
+
+                /* Allow click to go through */
+                if ( ! temp || ! respond ) {
+                        return;
+                }
+
+                r.getElement( 'bbp_reply_to' ).value = '0';
+
+                temp.parentNode.insertBefore( respond, temp );
+                temp.parentNode.removeChild( temp );
+
+                cancel.style.display = 'none';
+                cancel.onclick       = null;
+
+                r.addEditor();
+                r.scrollToForm();
+
+                /* Prevent click from going through */
                 return false;
         },