Changeset 11571

Timestamp:

02/17/2022 08:05:05 AM (3 years ago)

Author:

dd32

Message:

Support: Attempt to fix the ajaxification of topic admin actions on views.

See #1965.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support

Files:

• functions.php (modified) (1 diff)
• js/forums.js (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -41 +41 @@
 
     wp_enqueue_script( 'wporg-support-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20181209', true );
-    wp_enqueue_script( 'wporg-support-forums', get_template_directory_uri() . '/js/forums.js', array( 'jquery' ), '20210407', true );
+    wp_enqueue_script( 'wporg-support-forums', get_template_directory_uri() . '/js/forums.js', array( 'jquery' ), '20220217', true );
 
     wp_localize_script(

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/js/forums.js

@@ -55 +55 @@
     
         $this.val(
-            val.substr( 0, $this.prop('selectionStart') ) +      // Text before cusor/selection
+            val.substr( 0, $this.prop('selectionStart') ) +      // Text before cursor/selection
             "`" + paste + "`" +                                  // The pasted text, wrapping with `
             val.substr( $this.prop('selectionEnd'), val.length ) // Text after cursor position/selection
@@ -64 +64 @@
 
     if ( $( 'body' ).is( '.bbp-view' ) ) {
-        $( '.bbp-body .bbp-admin-links a' ).click( function( e ) {
+        $( '.bbp-admin-links a' ).click( function( e ) {
             var $this = $( this ),
-                $element = $this.closest( '.bbp-body' ),
-                $content = $element.find( '.bbp-topic-content' ),
+                $element = $this.parents('.reply,.topic'),
                 type;
 
             // Don't affect open-in-new-tab.
-            if ( e.metaKey || e.ctrlKey || e.which === 2 ) {
+            if ( e.metaKey || e.ctrlKey || e.shiftKey ) {
                 return;
             }
@@ -90 +89 @@
 
             $.get( $this.prop( 'href' ) ).done( function() {
-                $content.append(
+                $this.parent().before(
                     '<div class="bbp-template-notice">' + wporgSupport.strings[ type ] + '</div>'
                 );
 
-                // Remove actions.
-                $this.parent().find('a:not(.bbp-topic-edit-link)').remove();
-
                 $element.fadeTo( 250, 1 );
-            } ).error( function() {
-                $content.append(
+            } ).fail( function() {
+                $this.parent().before(
                     '<div class="bbp-template-notice">' + wporgSupport.strings.action_failed + '</div>'
                 );