Bring in changes from previous release

Author: dcooney

build/frontend/ajax-load-more.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '52ba44d7ced59bb3bc05');
+<?php return array('dependencies' => array(), 'version' => '4461a320a7fb2fa056a9');

build/frontend/ajax-load-more.js

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'fc4df552f90365c4b09b');
+<?php return array('dependencies' => array(), 'version' => '7ce74d0284b6a2c0b803');

build/frontend/ajax-load-more.min.asset.php

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-06-10T11:24:21+00:00\n"
+"POT-Creation-Date: 2025-06-10T11:33:15+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"

build/frontend/ajax-load-more.min.js

@@ -1,6 +1,6 @@
 // ALM Modules
 import axios from 'axios';
-import '../scss/ajax-load-more.scss';
+import DOMPurify from 'dompurify';
 import { cacheCreateParams, getCache } from './addons/cache';
 import { ctaCreateParams } from './addons/call-to-actions';
 import { commentsCreateParams } from './addons/comments';
@@ -33,15 +33,16 @@ 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, {
@@ -144,15 +145,16 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 		alm.trigger = alm.btnWrap[alm.btnWrap.length - 1];
 		alm.button = alm?.trigger?.querySelector('button.alm-load-more-btn') || null;
 
+		// Button Labels.
 		alm.button_labels = {
-			default: alm?.listing?.dataset?.buttonLabel || alm_localize?.button_label,
-			loading: alm?.listing?.dataset?.buttonLoadingLabel || null,
-			done: alm?.listing?.dataset?.buttonDoneLabel || null,
+			default: DOMPurify.sanitize(alm?.listing?.dataset?.buttonLabel) || DOMPurify.sanitize(alm_localize?.button_label),
+			loading: DOMPurify.sanitize(alm?.listing?.dataset?.buttonLoadingLabel) || null,
+			done: DOMPurify.sanitize(alm?.listing?.dataset?.buttonDoneLabel) || null,
 		};
 		alm.prev_button_labels = {
-			default: alm?.listing?.dataset?.prevButtonLabel,
-			loading: alm?.listing?.dataset?.prevButtonLoadingLabel || null,
-			done: alm?.listing?.dataset?.prevButtonDoneLabel || null,
+			default: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonLabel),
+			loading: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonLoadingLabel) || null,
+			done: DOMPurify.sanitize(alm?.listing?.dataset?.prevButtonDoneLabel) || null,
 		};
 
 		alm.urls = alm?.listing?.dataset?.urls === 'false' ? false : true;
@@ -433,7 +435,7 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 				params = '';
 			}
 
-			// HTTP request via axios.
+			// Make API request.
 			const data = await axios
 				.get(url, { params })
 				.then(function (response) {
@@ -449,7 +451,7 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 					return response.data; // Standard ALM.
 				})
 				.catch(function (error) {
-					alm.AjaxLoadMore.error(error, 'adminajax');
+					alm.AjaxLoadMore.error(error);
 				});
 
 			switch (type) {
@@ -518,7 +520,7 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 				})
 				.catch(function (error) {
 					// Error
-					alm.AjaxLoadMore.error(error, 'restapi');
+					alm.AjaxLoadMore.error(error);
 				});
 		};
 
@@ -988,7 +990,7 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 				})
 				.catch(function (error) {
 					// Error
-					alm.AjaxLoadMore.error(error, 'getSinglePost');
+					alm.AjaxLoadMore.error(error);
 					alm.fetchingPreviousPost = false;
 				});
 
@@ -1531,37 +1533,18 @@ const isBlockEditor = document.body.classList.contains('wp-admin');
 		};
 
 		/**
-		 * Handle error messages.
+		 * Handle API errors by reseting the loading state and button text.
 		 *
-		 * @param {string} error    The error message.
-		 * @param {string} location The location the error occured.
+		 * @param {string} error The error message.
 		 * @since 2.6.0
 		 */
-		alm.AjaxLoadMore.error = function (error, location = null) {
+		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.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);
-			}
 		};
 
 		/**