Merge branch 'hotfix/1.20.4'

Author: danieliser

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
       url: https://wordpress.org/support/plugin/popup-maker/
       about: Please ask for support here.
     - name: Popup Maker Documentation
-      url: https://docs.wppopupmaker.com
+      url: https://wppopupmaker.com
       about: Please review our documentation.

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Tweak: Updated documentation links to use new docs site.
+- Fix: Popup title aria-labelledby attribute was being double-quoted. Thanks  to the [Equalize Digital](https://equalizedigital.com/) team.
+
 ## v1.20.3 - 2024-11-27
 
 * Fix: Deprecated notice in WordPress 6.7+ for early translation loading in plugin configuration.

assets/js/admin-general.js

@@ -53,11 +53,14 @@
 		count = parseInt($noticeCounts.eq(0).text());
 
 	function dismissAlert($alert, alertAction) {
-		var dismissible = $alert.data("dismissible"),
+		var dismissible = $alert.data('dismissible'),
 			expires =
-				dismissible === "1" || dismissible === 1 || dismissible === true
+				$alert.data('expires') ? $alert.data('expires') :
+				(dismissible === '1' ||
+				dismissible === 1 ||
+				dismissible === true
 					? null
-					: dismissible;
+					: dismissible + ' days');
 
 		$.ajax({
 			method: "POST",

assets/js/admin-general.min.js

@@ -2123,7 +2123,7 @@ var pum_debug_mode = false,
 				debug_mode_enabled: "Popup Maker: Debug Mode Enabled",
 				debug_started_at: "Debug started at:",
 				debug_more_info:
-					"For more information on how to use this information visit https://docs.wppopupmaker.com/?utm_medium=js-debug-info&utm_campaign=contextual-help&utm_source=browser-console&utm_content=more-info",
+					"For more information on how to use this information visit https://wppopupmaker.com/docs/?utm_medium=js-debug-info&utm_campaign=contextual-help&utm_source=browser-console&utm_content=more-info",
 				global_info: "Global Information",
 				localized_vars: "Localized variables",
 				popups_initializing: "Popups Initializing",

assets/js/site.js

@@ -11,7 +11,7 @@
 	function dismissAlert($alert, alertAction) {
 		var dismissible = $alert.data('dismissible'),
 			expires =
-				$alert.data('expires') ??
+				$alert.data('expires') ? $alert.data('expires') :
 				(dismissible === '1' ||
 				dismissible === 1 ||
 				dismissible === true

assets/js/site.min.js

@@ -19,7 +19,7 @@ var pum_debug_mode = false,
 				debug_mode_enabled: "Popup Maker: Debug Mode Enabled",
 				debug_started_at: "Debug started at:",
 				debug_more_info:
-					"For more information on how to use this information visit https://docs.wppopupmaker.com/?utm_medium=js-debug-info&utm_campaign=contextual-help&utm_source=browser-console&utm_content=more-info",
+					"For more information on how to use this information visit https://wppopupmaker.com/docs/?utm_medium=js-debug-info&utm_campaign=contextual-help&utm_source=browser-console&utm_content=more-info",
 				global_info: "Global Information",
 				localized_vars: "Localized variables",
 				popups_initializing: "Popups Initializing",

assets/js/src/admin/general/plugins/alerts.js

@@ -60,19 +60,32 @@ fs.writeFileSync( changelogFilePath, updatedChangelog, 'utf8' );
 
 // Insert unreleased changes into readme.txt
 const readmeContent = fs.readFileSync( readmeFilePath, 'utf8' );
-const changelogPattern = /== Changelog ==([\s\S]*?)(= v\d+\.\d+\.\d+ - \d{2}\/\d{2}\/\d{4} =)/;
+
+// Find the changelog section and first version entry
+const changelogPattern = /== Changelog ==\n\nFor the latest updates and release information:.*?\n\n(= v\d+\.\d+\.\d+ - \d{4}-\d{2}-\d{2} =)/s;
 const changelogMatch = readmeContent.match( changelogPattern );
 
-const newChangelog = `== Changelog ==\n\nView our [complete changelog](https://github.com/PopupMaker/Popup-Maker/blob/master/CHANGELOG.md) for up-to-date information on what has been going on with the development of Popup Maker.\n\n= v${ newVersion } - ${ releaseDate } =\n\n${ formattedFileChanges }\n\n${
-	changelogMatch ? changelogMatch[ 2 ] : ''
-}`;
+if ( ! changelogMatch ) {
+	console.error( 'Could not find changelog section or first version entry' );
+	process.exit( 1 );
+}
 
-fs.writeFileSync(
-	readmeFilePath,
-	readmeContent.replace( changelogPattern, newChangelog ).trim(),
-	'utf8'
+// Create the new version entry
+const newVersionEntry = `= v${ newVersion } - ${ releaseDate } =\n\n${ formattedFileChanges }\n\n`;
+
+// Insert the new version entry before the first existing version
+const newChangelog = readmeContent.replace(
+	changelogPattern,
+	( match, firstVersion ) => {
+		return match.replace(
+			firstVersion,
+			`${ newVersionEntry }${ firstVersion }`
+		);
+	}
 );
 
+fs.writeFileSync( readmeFilePath, newChangelog.trim(), 'utf8' );
+
 // Output the count of changes
 console.log(
 	`Changelog updated successfully with ${ changeCount } change(s).`

assets/js/src/site/plugins/pum-debug.js

@@ -371,11 +371,11 @@ public static function get_random_tip() {
 			],
 			[
 				'msg'  => 'Using the Popup Maker menu in your admin bar, you can open and close popups, check conditions, reset cookies, and more!',
-				'link' => 'https://docs.wppopupmaker.com/article/300-the-popup-maker-admin-toolbar',
+				'link' => 'https://wppopupmaker.com/docs/problem-solving/turning-on-the-popups-admin-bar/',
 			],
 			[
 				'msg'  => "Did you know: You can easily customize your site's navigation to have a link open a popup by using the 'Trigger a Popup' option when editing your menus?",
-				'link' => 'https://docs.wppopupmaker.com/article/51-open-a-popup-from-a-wordpress-nav-menu',
+				'link' => 'https://wppopupmaker.com/docs/menu/open-a-popup-from-a-wordpress-nav-menu/',
 			],
 		];