Changeset 3463709

Timestamp:

02/17/2026 05:18:44 PM (3 months ago)

Author:

xavivars

Message:

Fix shortcode ajax loader

Location:

xv-random-quotes/trunk

Files:

• changelog.txt (modified) (1 diff)
• js/quote-refresh.js (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• src/Output/QuoteOutput.php (modified) (3 diffs)
• src/RestAPI/QuoteEndpoint.php (modified) (4 diffs)
• src/Shortcodes/ShortcodeHandlers.php (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)
• xv-random-quotes.php (modified) (1 diff)

xv-random-quotes/trunk/changelog.txt

@@ -1 +1 @@
 == XV Random Quotes ==
+
+= 2.6.1 =
+Fix: Sequential mode now works on shortcodes
+Fix: LinkPhrase not being required for AJAX shortcodes
+Improvement: Added `enable_ajax` as an equivalent (in reverse) to `noajax` for shortcodes.
 
 = 2.6.0 =

xv-random-quotes/trunk/js/quote-refresh.js

@@ -56 +56 @@
         const disableaspect = container.getAttribute('data-disableaspect') === '1';
         const contributor = container.getAttribute('data-contributor') || '';
+        const currentId = container.getAttribute('data-current-id') || '';
 
         // Build query string
@@ -64 +65 @@
         if (sequence) {
             params.append('sequence', '1');
+            // For sequential mode, send current ID to get next quote
+            if (currentId) {
+                params.append('current_id', currentId);
+            }
         }
         if (multi > 1) {
@@ -105 +110 @@
                 // Get the refresh link wrapper to preserve it
                 const refreshWrapper = container.querySelector('.xv-quote-refresh-wrapper');
-                
+
                 // Update the container content
                 // We need to replace everything except the refresh link
                 const tempDiv = document.createElement('div');
                 tempDiv.innerHTML = data.html;
-                
+
                 // Clear container except for refresh wrapper
                 while (container.firstChild && container.firstChild !== refreshWrapper) {
                     container.removeChild(container.firstChild);
                 }
-                
+
                 // Insert new content before refresh wrapper
                 if (refreshWrapper) {
@@ -125 +130 @@
                     container.innerHTML = data.html;
                 }
-                
+
+                // Update current ID for sequential tracking
+                if (data.quote_id) {
+                    container.setAttribute('data-current-id', data.quote_id);
+                }
+
+                // Handle end of sequence
+                if (data.end_of_sequence && refreshWrapper) {
+                    const refreshLink = refreshWrapper.querySelector('.xv-quote-refresh');
+                    if (refreshLink) {
+                        refreshLink.style.display = 'none';
+                    }
+                }
+
                 // Fade in
                 container.style.opacity = '1';

xv-random-quotes/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 2.6.0
+Stable tag: 2.6.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

xv-random-quotes/trunk/src/Output/QuoteOutput.php

@@ -118 +118 @@
         // Wrap with AJAX functionality if enabled
         if ( $args['enable_ajax'] ) {
-            return $this->wrap_with_ajax( $quote_html, $args );
+            return $this->wrap_with_ajax( $quote_html, $args, $quotes );
         }
 
@@ -129 +129 @@
      * @param string $quote_html The rendered quote HTML.
      * @param array  $args       Arguments array with AJAX configuration.
+     * @param array  $quotes     Array of WP_Post quote objects being displayed.
      * @return string HTML wrapped with AJAX functionality.
      */
-    private function wrap_with_ajax( $quote_html, $args ) {
+    private function wrap_with_ajax( $quote_html, $args, $quotes = array() ) {
         // Generate or use provided container ID
         $container_id = ! empty( $args['container_id'] ) ? $args['container_id'] : 'xv-quote-container-' . uniqid();
@@ -144 +145 @@
         if ( ! empty( $args['contributor'] ) ) {
             $output .= ' data-contributor="' . esc_attr( $args['contributor'] ) . '"';
+        }
+
+        // Add current quote ID(s) for sequential tracking
+        if ( ! empty( $quotes ) ) {
+            if ( $args['multi'] > 1 ) {
+                // For multiple quotes, store comma-separated IDs
+                $quote_ids = array_map( function( $quote ) {
+                    return $quote->ID;
+                }, $quotes );
+                $output .= ' data-current-id="' . esc_attr( implode( ',', $quote_ids ) ) . '"';
+            } else {
+                // For single quote, store just the ID
+                $output .= ' data-current-id="' . esc_attr( $quotes[0]->ID ) . '"';
+            }
         }
 

xv-random-quotes/trunk/src/RestAPI/QuoteEndpoint.php

@@ -80 +80 @@
                 'sanitize_callback' => 'sanitize_text_field',
             ),
+            'current_id'     => array(
+                'description'       => 'Current quote ID(s) for sequential progression (comma-separated for multi)',
+                'type'              => 'string',
+                'default'           => '',
+                'sanitize_callback' => 'sanitize_text_field',
+            ),
         );
     }
@@ -96 +102 @@
         $disableaspect = $request->get_param( 'disableaspect' );
         $contributor   = $request->get_param( 'contributor' );
+        $current_id    = $request->get_param( 'current_id' );
 
         // Get quotes first (before rendering)
@@ -107 +114 @@
             'posts_per_page' => $multi,
         );
-        
+
         // Add ordering
         if ( $sequence ) {
             $query_args['orderby'] = 'date';
             $query_args['order'] = 'ASC';
+
+            // If current_id is provided, get the next quote(s) after it
+            if ( ! empty( $current_id ) ) {
+                // For multi-quote, get the last ID
+                $current_ids = explode( ',', $current_id );
+                $last_id = end( $current_ids );
+
+                // Get the post to find its date
+                $current_post = get_post( absint( $last_id ) );
+                if ( $current_post ) {
+                    // Query for quotes published after this date
+                    $query_args['date_query'] = array(
+                        array(
+                            'after'     => $current_post->post_date,
+                            'inclusive' => false,
+                        ),
+                    );
+                }
+            }
         } else {
             $query_args['orderby'] = 'rand';
         }
-        
+
         // Get quotes
         if ( ! empty( $categories_array ) ) {
@@ -156 +182 @@
         );
 
+        // Check if we've reached the end of sequence
+        $end_of_sequence = false;
+        if ( $sequence && ! empty( $current_id ) ) {
+            // If we got quotes, check if there are more after these
+            if ( ! empty( $quotes ) ) {
+                $last_quote = end( $quotes );
+                $check_query_args = array(
+                    'posts_per_page' => 1,
+                    'fields'         => 'ids',
+                    'orderby'        => 'date',
+                    'order'          => 'ASC',
+                    'date_query'     => array(
+                        array(
+                            'after'     => $last_quote->post_date,
+                            'inclusive' => false,
+                        ),
+                    ),
+                );
+
+                // Check for more quotes
+                if ( ! empty( $categories_array ) ) {
+                    $more_quotes = $quote_queries->get_quotes_by_categories( $categories_array, $check_query_args );
+                } else {
+                    $more_quotes = $quote_queries->get_all_quotes( $check_query_args );
+                }
+
+                $end_of_sequence = empty( $more_quotes );
+            }
+        }
+
+        $response_data['end_of_sequence'] = $end_of_sequence;
+
         // Add metadata for single quote
         if ( $multi === 1 && ! empty( $quotes ) && count( $quotes ) > 0 ) {
             $quote = $quotes[0];
-            
+
             $response_data['quote_id']      = $quote->ID;
             $response_data['quote_text']    = wp_strip_all_tags( $quote->post_content );
             $response_data['quote_content'] = $quote->post_content;
-            
+
             // Get author
             $authors = wp_get_post_terms( $quote->ID, 'quote_author' );
-            $response_data['author'] = ! empty( $authors ) && ! is_wp_error( $authors ) 
-                ? $authors[0]->name 
+            $response_data['author'] = ! empty( $authors ) && ! is_wp_error( $authors )
+                ? $authors[0]->name
                 : '';
-            
+
             // Get source
             $response_data['source'] = get_post_meta( $quote->ID, '_quote_source', true );
-            
+
             // Get categories
             $categories_terms = wp_get_post_terms( $quote->ID, 'quote_category' );

xv-random-quotes/trunk/src/Shortcodes/ShortcodeHandlers.php

@@ -110 +110 @@
         'widgetid' => '',
         'noajax' => '',
+        'enable_ajax' => '',
         'multi' => 1,
         'timer' => '',
@@ -118 +119 @@
     ));
 
-    // Determine if AJAX is enabled (noajax="" means enabled)
-    $enable_ajax = empty( $atts['noajax'] ) && ! empty( $atts['linkphrase'] );
+    // Determine if AJAX is enabled
+    // Priority order:
+    // 1. If enable_ajax is explicitly set, use it (true = enable, false = disable)
+    // 2. Otherwise, use legacy noajax logic (noajax="" or false = enable, noajax="true" = disable)
+    // 3. Check global AJAX setting (if globally disabled, override to false)
+    if ( ! empty( $atts['enable_ajax'] ) ) {
+        // Explicit enable_ajax parameter takes priority
+        $enable_ajax = filter_var( $atts['enable_ajax'], FILTER_VALIDATE_BOOLEAN );
+    } else {
+        // Legacy noajax logic: empty/false = AJAX enabled
+        $enable_ajax = empty( $atts['noajax'] );
+    }
+
+    // Check global AJAX setting (if disabled globally, override to false)
+    $global_ajax_disabled = get_option( \XVRandomQuotes\Admin\Settings::OPTION_AJAX, false );
+    if ( $global_ajax_disabled ) {
+        $enable_ajax = false;
+    }
 
     // Use QuoteOutput class for complete rendering (including AJAX if enabled)

xv-random-quotes/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'c5c63fb91808ddbfdfb9ab496437bfe15ad21871',
+        'reference' => 'ce36e0cf96881317dd73f3a6f9cdd2878096ee62',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'c5c63fb91808ddbfdfb9ab496437bfe15ad21871',
+            'reference' => 'ce36e0cf96881317dd73f3a6f9cdd2878096ee62',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

xv-random-quotes/trunk/xv-random-quotes.php

@@ -5 +5 @@
 Author: Xavi Ivars
 Author URI: https://xavi.ivars.me/
-Version: 2.6.0
+Version: 2.6.1
 Requires at least: 6.0
 Requires PHP: 7.4