Merge pull request #200 from dcooney/hotfix/shortcode-builder

Hotfix/shortcode builder
ajaxloadmore · Jun 14, 2023 · d7b8742 · d7b8742
2 parents de44af0 + c35504c
commit d7b8742
Show file tree

Hide file tree

Showing 9 changed files with 15,720 additions and 965 deletions.
diff --git a/README.txt b/README.txt
@@ -5,7 +5,7 @@ Tags: infinite scroll, load more, ajax, lazy load, endless scroll, infinite scro
 Requires at least: 4.4
 Requires PHP: 5.6
 Tested up to: 6.2
-Stable tag: 6.0.0
+Stable tag: 6.0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -263,6 +263,11 @@ How to install Ajax Load More.
 
 == Changelog ==
 
+= 6.0.1 - June 13, 2023 =
+* HOTFIX: Fixed issue with Shortcode Builder JavaScript error causing issues in admin.
+* HOTFIX: Fixed issue with posts_per_page="-1" unintentionally not loading any posts.
+
+
 = 6.0.0 - June 11, 2023 =
 * NOTICE: Ajax Load More 6.0 is a major update and includes a breaking changes with regards to the Cache add-on. Please review the information below before updating.
 * NOTICE: Cache add-on < 2.0 is no longer supported by Ajax Load More. Please update to the latest version of the add-on to continue using the Cache functionality.

diff --git a/admin/shortcode-builder/shortcode-builder.php b/admin/shortcode-builder/shortcode-builder.php
@@ -15,14 +15,14 @@
 		<div class="cnkt-sticky-wrapper">
 			<ul class="cnkt-sticky">
 				<?php if ( alm_has_addon_shortcodes() ) { ?>
-				<li><button type="button" class="active"><i class="fa fa-plus-circle"></i> <?php _e( 'Add-ons', 'ajax-load-more' ); ?></button></li>
+				<li><button type="button" class="active" data-id="add-ons"><i class="fa fa-plus-circle"></i> <?php _e( 'Add-ons', 'ajax-load-more' ); ?></button></li>
 				<?php } ?>
 				<?php if ( alm_has_extension_shortcodes() ) { ?>
-				<li><button type="button"><i class="fa fa-plug"></i> <?php _e( 'Extensions', 'ajax-load-more' ); ?></button></li>
+				<li><button type="button" data-id="extensions"><i class="fa fa-plug"></i> <?php _e( 'Extensions', 'ajax-load-more' ); ?></button></li>
 				<?php } ?>
-				<li><button type="button"><i class="fa fa-cog"></i> <?php _e( 'Display Settings', 'ajax-load-more' ); ?></button></li>
-				<li><button type="button"><i class="fa fa-database"></i> <?php _e( 'Query Parameters', 'ajax-load-more' ); ?></button></li>
-				<li><button type="button"><i class="fa fa-handshake-o" aria-hidden="true"></i> <?php _e( 'Integrations', 'ajax-load-more' ); ?></button></li>
+				<li><button type="button" data-id="display-settings"><i class="fa fa-cog"></i> <?php _e( 'Display Settings', 'ajax-load-more' ); ?></button></li>
+				<li><button type="button" data-id="query-parameters"><i class="fa fa-database"></i> <?php _e( 'Query Parameters', 'ajax-load-more' ); ?></button></li>
+				<li><button type="button" data-id="integrations"><i class="fa fa-handshake-o" aria-hidden="true"></i> <?php _e( 'Integrations', 'ajax-load-more' ); ?></button></li>
 			</ul>
 		</div>
 	</div>
@@ -33,7 +33,7 @@
 		<?php
 			// ../admin-functions.php
 			if(alm_has_addon_shortcodes()) : ?>
-		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0">
+		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0" id="add-ons">
 
 			<h2><?php _e('Add-ons', 'ajax-load-more'); ?></h2>
 			<p class="section-intro">
@@ -64,7 +64,7 @@
 		<?php
 			// ../admin-functions.php
 			if ( alm_has_extension_shortcodes() ) : ?>
-		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0">
+		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0" id="extensions">
 
 			<h2><?php _e('Extensions', 'ajax-load-more'); ?></h2>
 			<p class="section-intro">
@@ -84,7 +84,7 @@
 		<!-- End Extensions -->
 
 		<!-- Display Settings -->
-		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0">
+		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0" id="display-settings">
 
 			<h2><?php _e('Display Settings', 'ajax-load-more'); ?></h2>
 			<p class="section-intro">
@@ -796,7 +796,7 @@
 		<!-- ****************************** -->
 
 		<!-- Query Parameters -->
-		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0">
+		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0" id="query-parameters">
 
 			<h2>
 				<?php _e('Query Parameters', 'ajax-load-more'); ?>
@@ -1393,7 +1393,7 @@
 		<!-- ****************************** -->
 
 		<!-- Integrations -->
-		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0">
+		<div class="shortcode-parameter-wrap alm-tabbed-wrapper--section" tabindex="0" id="integrations">
 
 			<h2><?php _e('Integrations', 'ajax-load-more'); ?></h2>
 			<p class="section-intro">

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: 6.0.0
+ * Version: 6.0.1
  * License: GPL
  * Copyright: Darren Cooney & Connekt Media
  *
  * @package AjaxLoadMore
  */
 
-define( 'ALM_VERSION', '6.0.0' );
-define( 'ALM_RELEASE', 'June 11, 2023' );
+define( 'ALM_VERSION', '6.0.1' );
+define( 'ALM_RELEASE', 'June 13, 2023' );
 define( 'ALM_STORE_URL', 'https://connekthq.com' );
 
 // Plugin installation helpers.