Merge pull request #26 from newfold-labs/fix/PRESS10-239

Fix use the siteUrl for build the url with tracking parameters in JS

Author: circlecube

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'bb67971ce0533fc3cea2');
+<?php return array('dependencies' => array(), 'version' => '9af3bb6fbedda8b0ad32');

build/index.js

@@ -18,7 +18,7 @@
 	// Function to add query parameters to a URL while preserving the fragment (hash) part.
 	function addQueryArgsPreserveFragment( url, params ) {
 		const [ baseUrl, fragment ] = url.split( '#', 2 );
-		const urlObj = new URL( baseUrl, window.location.origin );
+		const urlObj = new URL( baseUrl, window.NewfoldRuntime?.siteUrl );
 		Object.entries( params ).forEach( ( [ key, value ] ) => {
 			urlObj.searchParams.set( key, value );
 		} );
@@ -46,15 +46,17 @@
 				window.location.hash;
 
 			// Check if the URL is relative or absolute
+			// We use the siteUrl to avoid issues on sites that are located in subdirectories.
+			// Example: https://example.com/website_44554
 			if ( ! url.startsWith( 'http' ) && ! url.startsWith( '/' ) ) {
 				const isInWpAdmin =
 					window.location.pathname.includes( '/wp-admin/' );
 				url = isInWpAdmin
-					? window.location.origin + '/wp-admin/' + url
-					: window.location.origin + '/' + url;
+					? window.NewfoldRuntime?.siteUrl + '/wp-admin/' + url
+					: window.NewfoldRuntime?.siteUrl + '/' + url;
 			}
 
-			const urlObj = new URL( url, window.location.origin );
+			const urlObj = new URL( url, window.NewfoldRuntime?.siteUrl );
 
 			const defaultParams = {
 				channelid: urlObj.pathname.includes( 'wp-admin' )