Fixed issue with registering the load_text_domain() function (#236)

dcooney · web-flow · commit dcb17cb450ba · 2025-06-10T07:25:15.000-04:00
* Fix for load_text_domain action, add single posts querystring.

* Adding fix for load_text_domain

* Updated build assets
diff --git a/README.txt b/README.txt
@@ -5,7 +5,7 @@ Tags: infinite scroll, load more, lazy load, endless scroll, ajax load more
 Requires at least: 5.0
 Requires PHP: 5.6
 Tested up to: 6.8
-Stable tag: 7.4.1
+Stable tag: 7.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -269,6 +269,11 @@ How to install Ajax Load More.
 
 == Changelog ==
 
+= 7.4.2 - June 10, 2025 =
+* FIX: Fixed issue with registering the load_text_domain() function.
+* UPDATE: Updated functions to get the querystring with the SEO and Single Posts Add-on. [DONE]
+* UPDATE: Various updates UI/UX updates to the core plugin.
+
 = 7.4.1 - June 6, 2025 =
 * UPDATE: Updated license handling functionality to reduce failed attempted to activate licenses.
 * UPDATE: Various code cleanup and UI updates throughout the plugin.
diff --git a/admin/views/shortcode-builder.php b/admin/views/shortcode-builder.php
@@ -29,7 +29,7 @@
 				<div class="major-publishing-actions">
 					<button class="button button-primary copy copy-to-clipboard" data-copied="<?php _e( 'Copied!', 'ajax-load-more' ); ?>"><?php _e( 'Copy Shortcode', 'ajax-load-more' ); ?></button>
 					<a id="shortcode-preview" class="button button-secondary" data-home-url="<?php echo esc_url( get_home_url() ); ?>" href="<?php echo esc_url( get_home_url() ); ?>?alm_preview=[ajax_load_more]" target="_blank"><?php _e( 'Preview', 'ajax-load-more' ); ?></a>
-					<button class="button reset-shortcode-builder"><i class="fa fa-refresh"></i> <?php _e( 'Reset', 'ajax-load-more' ); ?></button>
+					<button class="button reset-shortcode-builder"><?php _e( 'Reset', 'ajax-load-more' ); ?></button>
 				</div>
 			</div>
 		</aside>
diff --git a/ajax-load-more.php b/ajax-load-more.php
@@ -7,15 +7,15 @@
  * Author: Darren Cooney
  * Twitter: @KaptonKaos
  * Author URI: https://connekthq.com
- * Version: 7.4.1
+ * Version: 7.4.2
  * License: GPL
  * Copyright: Darren Cooney & Connekt Media
  *
  * @package AjaxLoadMore
  */
 
-define( 'ALM_VERSION', '7.4.1' );
-define( 'ALM_RELEASE', 'June 6, 2025' );
+define( 'ALM_VERSION', '7.4.2' );
+define( 'ALM_RELEASE', 'June 10, 2025' );
 define( 'ALM_STORE_URL', 'https://connekthq.com' );
 
 require_once plugin_dir_path( __FILE__ ) . 'core/functions/install.php';
@@ -68,6 +68,7 @@ public function __construct() {
 			add_action( 'wp_ajax_nopriv_alm_get_posts', [ $this, 'alm_query_posts' ] );
 			add_action( 'wp_enqueue_scripts', [ $this, 'alm_enqueue_scripts' ] );
 			add_action( 'after_setup_theme', [ $this, 'alm_image_sizes' ] );
+			add_action( 'init', [ $this, 'alm_load_text_domain' ] );
 
 			add_filter( 'alm_noscript', [ $this, 'alm_noscript' ], 10, 6 );
 			add_filter( 'alm_noscript_pagination', [ $this, 'alm_noscript_pagination' ], 10, 3 );
@@ -76,7 +77,6 @@ public function __construct() {
 			add_filter( 'widget_text', 'do_shortcode' );
 
 			add_shortcode( 'ajax_load_more', [ $this, 'alm_shortcode' ] );
-			add_shortcode( 'init', [ $this, 'alm_load_text_domain' ] );
 		}
 
 		/**
diff --git a/build/frontend/ajax-load-more.asset.php b/build/frontend/ajax-load-more.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'f8febdd59d7681183d3b');
+<?php return array('dependencies' => array(), 'version' => '52ba44d7ced59bb3bc05');
diff --git a/build/frontend/ajax-load-more.js b/build/frontend/ajax-load-more.js
diff --git a/build/frontend/ajax-load-more.min.asset.php b/build/frontend/ajax-load-more.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '9abc759e5688db9e01bd');
+<?php return array('dependencies' => array(), 'version' => 'fc4df552f90365c4b09b');
diff --git a/build/frontend/ajax-load-more.min.js b/build/frontend/ajax-load-more.min.js
diff --git a/lang/ajax-load-more.pot b/lang/ajax-load-more.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the GPL.
 msgid ""
 msgstr ""
-"Project-Id-Version: Ajax Load More 7.4.1\n"
+"Project-Id-Version: Ajax Load More 7.4.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ajax-load-more\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-06-06T14:33:10+00:00\n"
+"POT-Creation-Date: 2025-06-10T11:24:21+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: ajax-load-more\n"
diff --git a/src/frontend/js/addons/seo.js b/src/frontend/js/addons/seo.js
@@ -52,7 +52,7 @@ export function seoCreateParams(alm) {
 export function addSEOAttributes(alm, element, pagenum, skipOffset = false) {
 	const { addons, canonical_url } = alm;
 	const { retain_querystring = true } = alm_localize;
-	const querystring = retain_querystring ? window.location.search : '';
+	const querystring = retain_querystring || alm.init ? window.location.search : '';
 
 	pagenum = !skipOffset ? getSEOPageNum(addons?.seo_offset, pagenum) : pagenum;
 
diff --git a/src/frontend/js/addons/singleposts.js b/src/frontend/js/addons/singleposts.js
@@ -177,9 +177,12 @@ export function addSinglePostsAttributes(alm, element) {
 	}
 
 	const { page, addons } = alm;
+	const { retain_querystring = true } = alm_localize;
+	const querystring = retain_querystring ? window.location.search : '';
+
 	element.setAttribute('class', `alm-single-post post-${addons.single_post_id}`);
 	element.dataset.id = addons.single_post_id;
-	element.dataset.url = addons.single_post_permalink;
+	element.dataset.url = `${addons.single_post_permalink}${querystring}`;
 	element.dataset.page = addons.single_post_target ? parseInt(page) + 1 : page;
 	element.dataset.title = addons.single_post_title;
 	return element;
diff --git a/src/frontend/js/ajax-load-more.js b/src/frontend/js/ajax-load-more.js
@@ -1,6 +1,6 @@
 // ALM Modules
 import axios from 'axios';
-import DOMPurify from 'dompurify';
+import '../scss/ajax-load-more.scss';
 import { cacheCreateParams, getCache } from './addons/cache';
 import { ctaCreateParams } from './addons/call-to-actions';
 import { commentsCreateParams } from './addons/comments';
@@ -33,16 +33,15 @@ import * as resultsText from './modules/resultsText';
 import setLocalizedVars from './modules/setLocalizedVars';
 import { tableOfContents } from './modules/tableofcontents';
 
-import '../scss/ajax-load-more.scss';
-
 // External packages.
 const qs = require('qs');
 const imagesLoaded = require('imagesloaded');
 
 // Axios Config.
 axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+
+// Axios Interceptor for nested data objects
 axios.interceptors.request.use((config) => {
-	// Axios Interceptor for nested data objects
 	config.paramsSerializer = (params) => {
 		// Qs is already included in the Axios package
 		return qs.stringify(params, {
@@ -146,14 +145,14 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 		alm.button = alm?.trigger?.querySelector('button.alm-load-more-btn') || null;
 
 		alm.button_labels = {
-			default: DOMPurify.sanitize(alm?.listing?.dataset?.buttonLabel) || alm_localize?.button_label,
-			loading: DOMPurify.sanitize(alm?.listing?.dataset?.buttonLoadingLabel) || null,
-			done: DOMPurify.sanitize(alm?.listing?.dataset?.buttonDoneLabel) || null,
+			default: alm?.listing?.dataset?.buttonLabel || alm_localize?.button_label,
+			loading: alm?.listing?.dataset?.buttonLoadingLabel || null,
+			done: alm?.listing?.dataset?.buttonDoneLabel || null,
 		};
 		alm.prev_button_labels = {
-			default: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonLabel),
-			loading: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonLoadingLabel) || null,
-			done: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonDoneLabel) || null,
+			default: alm?.listing?.dataset?.prevButtonLabel,
+			loading: alm?.listing?.dataset?.prevButtonLoadingLabel || null,
+			done: alm?.listing?.dataset?.prevButtonDoneLabel || null,
 		};
 
 		alm.urls = alm?.listing?.dataset?.urls === 'false' ? false : true;
@@ -434,7 +433,6 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 				params = '';
 			}
 
-			// Make API request.
 			// HTTP request via axios.
 			const data = await axios
 				.get(url, { params })
@@ -451,7 +449,7 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 					return response.data; // Standard ALM.
 				})
 				.catch(function (error) {
-					alm.AjaxLoadMore.error(error);
+					alm.AjaxLoadMore.error(error, 'adminajax');
 				});
 
 			switch (type) {
@@ -519,7 +517,8 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 					alm.AjaxLoadMore.render(obj);
 				})
 				.catch(function (error) {
-					alm.AjaxLoadMore.error(error);
+					// Error
+					alm.AjaxLoadMore.error(error, 'restapi');
 				});
 		};
 
@@ -988,7 +987,8 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 					return data;
 				})
 				.catch(function (error) {
-					alm.AjaxLoadMore.error(error);
+					// Error
+					alm.AjaxLoadMore.error(error, 'getSinglePost');
 					alm.fetchingPreviousPost = false;
 				});
 
@@ -1531,18 +1531,37 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 		};
 
 		/**
-		 * Handle API errors by reseting the loading state and button text.
+		 * Handle error messages.
 		 *
-		 * @param {string} error The error message.
+		 * @param {string} error    The error message.
+		 * @param {string} location The location the error occured.
 		 * @since 2.6.0
 		 */
-		alm.AjaxLoadMore.error = function (error = '') {
-			console.error('Ajax Load More: There was an error with the Ajax request.', error); //eslint-disable-line no-console
+		alm.AjaxLoadMore.error = function (error, location = null) {
 			alm.loading = false;
 			if (!alm.addons.paging) {
 				alm.button.classList.remove('loading');
 				alm.AjaxLoadMore.resetBtnText();
 			}
+			console.warn('Error: ', error);
+
+			if (error.response) {
+				// The request was made and the server responded with a status code that falls out of the range of 2xx.
+				console.error('Error Msg: ', error.message);
+			} else if (error.request) {
+				// The request was made but no response was received.
+				console.error(error.request);
+			} else {
+				// Something happened in setting up the request that triggered an Error.
+				console.error('Error Msg: ', error.message);
+			}
+
+			if (location) {
+				console.error('ALM Error started in ' + location);
+			}
+			if (error.config) {
+				console.error('ALM Error Debug: ', error.config);
+			}
 		};
 
 		/**
diff --git a/src/frontend/js/modules/filtering.js b/src/frontend/js/modules/filtering.js
@@ -139,6 +139,9 @@ function almSetFilters(speed, data, type, element) {
 					.toLowerCase();
 				listing.setAttribute('data-' + key, value);
 			}
+
+			almCleanFilterData(listing, data); // Cleanup Filters data
+
 			// Fade ALM back (Filters only)
 			almFadeIn(element, speed);
 			break;
@@ -162,11 +165,39 @@ function almSetFilters(speed, data, type, element) {
 
 	switch (type) {
 		case 'filter':
-			// Filters Complete (not the add-on)
+			// Filters Complete (not the add-on).
 			if (typeof almFilterComplete === 'function') {
-				// Standard Filtering
 				almFilterComplete();
 			}
 			break;
 	}
 }
+
+/**
+ * Clean up Taxonomy and Meta Query data from filters.
+ *
+ * @param {HTMLElement} listing The alm-listing container.
+ * @param {Object}      data    The data object containing filter parameters.
+ */
+function almCleanFilterData(listing, data) {
+	// If taxonomy is empty, remove taxonomy-related data attributes.
+	if (data && data.taxonomy === '') {
+		delete listing.dataset.taxonomy;
+		if (listing.dataset.taxonomyTerms) {
+			delete listing.dataset.taxonomy;
+			delete listing.dataset.taxonomyTerms;
+			delete listing.dataset.taxonomyOperator;
+			delete listing.dataset.taxonomyIncludeChildren;
+		}
+	}
+
+	// If metaKey is empty, remove meta-related data attributes.
+	if (data && data.metaKey === '') {
+		delete listing.dataset.metaKey;
+		if (listing.dataset.metaValue) {
+			delete listing.dataset.metaValue;
+			delete listing.dataset.metaType;
+			delete listing.dataset.metaCompare;
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php return array('dependencies' => array(), 'version' => 'f8febdd59d7681183d3b');`
	`1`	`+<?php return array('dependencies' => array(), 'version' => '52ba44d7ced59bb3bc05');`