← All changes | js/chat-script.js +100 -64 3.2.23 → 3.2.25 View file →

		@@ -1306,11 +1306,26 @@
1306	1306	let testingDataReceived = false;
1307	1307	let streamingStarted = false;
1308	1308	// Server-pushed html to append as its OWN bot bubble once the stream
1309	1309	// finishes (e.g. the consent-safe YouTube embed, plan 03ba33). Rendering is
1310		- // deferred to [DONE] so the embed always lands BELOW the streamed text.
	1310	+ // deferred to the end of the stream so the embed always lands BELOW the
	1311	+ // streamed text.
1311	1312	let pendingAppendHtml = '';
1312	1313
	1314	+ // Render the stashed appendix as its own bot bubble below the streamed
	1315	+ // text — mirrors how it is saved in the transcript, so history replays
	1316	+ // identically. Called from BOTH ends of a stream: the [DONE] line and
	1317	+ // the stream simply closing (the OpenAI Responses path and Gemini end
	1318	+ // without a [DONE] line). The stash is cleared, so a stream that sends
	1319	+ // [DONE] and then closes renders it once. Any future appendix-type
	1320	+ // event belongs in here, not in one of the two branches.
	1321	+ function flushAppendHtml() {
	1322	+ if (pendingAppendHtml) {
	1323	+ appendMessage("bot", "", pendingAppendHtml, [], false, botId);
	1324	+ pendingAppendHtml = '';
	1325	+ }
	1326	+ }
	1327	+
1313	1328	// Abortable stream: a fresh controller per turn, keyed by bot instance.
1314	1329	// The Stop control (send button swapped in place) aborts both the read
1315	1330	// loop and the underlying request.
1316	1331	var streamControl = { controller: new AbortController(), aborted: false };
		@@ -1391,8 +1406,10 @@
1391	1406
1392	1407	// Re-enable chat input when stream ends with content
1393	1408	enableChatInput(botId);
1394	1409
	1410	+ flushAppendHtml();
	1411	+
1395	1412	// Scroll the user's last message to the top now that the
1396	1413	// bot's full reply has rendered (gives max reading room).
1397	1414	var $chatBoxDone = getElement(botId, 'chat-box');
1398	1415	var $lastUserMsgDone = $chatBoxDone.find('.user-message').last();
		@@ -1423,16 +1440,9 @@
1423	1440
1424	1441	// Re-enable chat input after streaming completes
1425	1442	enableChatInput(botId);
1426	1443
1427		- // Render any server-pushed appendix html (e.g. the
1428		- // YouTube embed) as its own bot bubble below the
1429		- // streamed text — mirrors how it is saved in the
1430		- // transcript, so history replays identically.
1431		- if (pendingAppendHtml) {
1432		- appendMessage("bot", "", pendingAppendHtml, [], false, botId);
1433		- pendingAppendHtml = '';
1434		- }
	1444	+ flushAppendHtml();
1435	1445
1436	1446	// Scroll the user's last message to the top now
1437	1447	// that the bot's full reply has rendered.
1438	1448	var $chatBoxStreamDone = getElement(botId, 'chat-box');
		@@ -2251,8 +2261,56 @@
2251	2261	// Error rendering message - silently continue
2252	2262	}
2253	2263	}
2254	2264
	2265	+// Link clicks in bot and agent messages: the click is recorded, the browser
	2266	+// follows the anchor itself. Navigation must not wait for the tracking
	2267	+// request: a window.open() made from that request's callback is outside the
	2268	+// visitor's tap, and Safari's pop-up blocker drops it without a message.
	2269	+
	2270	+// Give a tracked anchor the target it should open in, and noopener on a new tab.
	2271	+function prepareTrackedLink($link) {
	2272	+ if (linkTarget === '_blank' && $link.attr('target') !== '_blank') {
	2273	+ $link.attr('target', '_blank');
	2274	+ }
	2275	+ if ($link.attr('target') === '_blank') {
	2276	+ var rel = $link.attr('rel') || '';
	2277	+ if (!/(^|\s)noopener(\s|$)/.test(rel)) {
	2278	+ $link.attr('rel', $.trim(rel + ' noopener'));
	2279	+ }
	2280	+ }
	2281	+}
	2282	+
	2283	+// Record one click, fire-and-forget. sendBeacon survives the page unloading
	2284	+// when the link opens in the same tab.
	2285	+function trackLinkClick(href, messageContext, botId) {
	2286	+ var fields = {
	2287	+ action: 'mxchat_track_url_click',
	2288	+ session_id: getChatSession(botId),
	2289	+ url: href,
	2290	+ message_context: messageContext,
	2291	+ nonce: mxchatChat.nonce
	2292	+ };
	2293	+ try {
	2294	+ if (navigator.sendBeacon && typeof FormData !== 'undefined') {
	2295	+ var body = new FormData();
	2296	+ $.each(fields, function(name, value) {
	2297	+ body.append(name, value == null ? '' : value);
	2298	+ });
	2299	+ if (navigator.sendBeacon(mxchatChat.ajax_url, body)) {
	2300	+ return;
	2301	+ }
	2302	+ }
	2303	+ } catch (error) {
	2304	+ // Fall through to the plain request
	2305	+ }
	2306	+ $.ajax({
	2307	+ url: mxchatChat.ajax_url,
	2308	+ type: 'POST',
	2309	+ data: fields
	2310	+ });
	2311	+}
	2312	+
2255	2313	// Helper function to attach link tracking with proper event handling
2256	2314	function attachLinkTracking(messageDiv, messageText, botId) {
2257	2315	botId = botId || 'default';
2258	2316	// Use a slight delay to ensure DOM is ready
		@@ -2270,11 +2328,13 @@
2270	2328	if (originalHref && (originalHref.startsWith('http://') || originalHref.startsWith('https://'))) {
2271	2329	// Remove any existing click handlers first
2272	2330	$link.off('click.tracking');
2273	2331
	2332	+ // The anchor carries its own target: the browser follows it
	2333	+ prepareTrackedLink($link);
	2334	+
2274	2335	// Add new click handler with namespace
2275	2336	$link.on('click.tracking', function(e) {
2276		- e.preventDefault();
2277	2337	e.stopPropagation();
2278	2338
2279	2339	const messageContext = typeof messageText === 'string'
2280	2340	? messageText.substring(0, 200)
		@@ -2279,30 +2339,10 @@
2279	2339	const messageContext = typeof messageText === 'string'
2280	2340	? messageText.substring(0, 200)
2281	2341	: '';
2282	2342
2283		- // Track the click
2284		- $.ajax({
2285		- url: mxchatChat.ajax_url,
2286		- type: 'POST',
2287		- data: {
2288		- action: 'mxchat_track_url_click',
2289		- session_id: getChatSession(botId),
2290		- url: originalHref,
2291		- message_context: messageContext,
2292		- nonce: mxchatChat.nonce
2293		- },
2294		- complete: function() {
2295		- // Always redirect, even if tracking fails
2296		- if ($link.attr('target') === '_blank' || linkTarget === '_blank') {
2297		- window.open(originalHref, '_blank');
2298		- } else {
2299		- window.location.href = originalHref;
2300		- }
2301		- }
2302		- });
2303		-
2304		- return false; // Extra insurance to prevent default
	2343	+ prepareTrackedLink($link);
	2344	+ trackLinkClick(originalHref, messageContext, botId);
2305	2345	});
2306	2346	}
2307	2347	});
2308	2348	}, 100); // Small delay to ensure DOM is ready
		@@ -2597,9 +2637,17 @@
2597	2637	});
2598	2638
2599	2639	// Process standalone URLs - but NOT if they're already in <a> tags or brackets
2600	2640	// Updated pattern to be more careful about what it matches
2601		- const urlPattern = /(^|[^">=\[\]])(https?:\/\/[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
	2641	+ //
	2642	+ // The prefix group (plan 78618d) is the start of a line, an ordinary
	2643	+ // character, OR a tag this formatter itself opened or closed (paragraph,
	2644	+ // list item, table cell, heading, emphasis, line break), so an address
	2645	+ // that opens a paragraph or sits inside **bold** is linked too. Never
	2646	+ // an anchor (its text would be linked twice; the lookahead guards that
	2647	+ // as well) and never a code span, which stays as typed. No lookbehind,
	2648	+ // for Safari.
	2649	+ const urlPattern = /(^|[^">=\[\]]|<\/?(?:p|li|td|th|h[1-6]|strong|em|b|i|del|br)(?:\s[^<>]*)?\/?>)(https?:\/\/[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
2602	2650	processedText = processedText.replace(urlPattern, (match, prefix, url) => {
2603	2651	// Extra check: make sure this isn't already linked
2604	2652	if (match.includes('href=') || match.includes('</a>')) {
2605	2653	return match;
		@@ -2610,10 +2658,14 @@
2610	2658	const safeUrl = safeEncodeUrl(cleanUrl);
2611	2659	return `${prefix}<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`;
2612	2660	});
2613	2661
2614		- // Process www. URLs - but NOT if they're already in <a> tags or brackets
2615		- const wwwPattern = /(^|[^">/\[\]])(www\.[\S]+)(?![^<]*<\/a>)(?!\])/gim;
	2662	+ // Process www. URLs - but NOT if they're already in <a> tags or brackets.
	2663	+ // The address stops at the same characters the https pattern stops at
	2664	+ // (plan 78618d): it used to run through the closing paragraph tag, so
	2665	+ // "Try www.example.com/page." linked to www.example.com/page.%3C/p%3E.
	2666	+ // Same prefix group as the https pattern, same reasons.
	2667	+ const wwwPattern = /(^|[^">/\[\]]|<\/?(?:p|li|td|th|h[1-6]|strong|em|b|i|del|br)(?:\s[^<>]*)?\/?>)(www\.[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim;
2616	2668	processedText = processedText.replace(wwwPattern, (match, prefix, url) => {
2617	2669	// Extra check: make sure this isn't already linked
2618	2670	if (match.includes('href=') || match.includes('</a>')) {
2619	2671	return match;
		@@ -2677,13 +2729,19 @@
2677	2729	protectedSegments.push(match);
2678	2730	return placeholder;
2679	2731	});
2680	2732
2681		- // Step 1c: Also protect bare URLs that might exist
	2733	+ // Step 1c: Also protect bare URLs that might exist. Trailing emphasis
	2734	+ // markers are not part of the address (plan 78618d): **https://x.com**
	2735	+ // used to protect "https://x.com**", so the bold never paired and the
	2736	+ // asterisks ended up inside the link. The markers stay outside the
	2737	+ // placeholder so the styling rules below can pair them.
2682	2738	protectedText = protectedText.replace(/(https?:\/\/[^\s<>"]+)/gi, function(match) {
	2739	+ const markers = match.match(/[*_~]+$/);
	2740	+ const url = markers ? match.slice(0, match.length - markers[0].length) : match;
2683	2741	const placeholder = `__PROTECTED_${protectedSegments.length}__`;
2684		- protectedSegments.push(match);
2685		- return placeholder;
	2742	+ protectedSegments.push(url);
	2743	+ return placeholder + (markers ? markers[0] : '');
2686	2744	});
2687	2745
2688	2746	// Step 2: Now apply text styling to the protected text
2689	2747	// Handle bold text (**text**)
		@@ -4550,14 +4608,8 @@
4550	4608	if (messageDiv.length > 0) {
4551	4609	const originalHref = $link.attr('href');
4552	4610
4553	4611	if (originalHref && (originalHref.startsWith('http://') || originalHref.startsWith('https://'))) {
4554		- e.preventDefault();
4555		- e.stopPropagation();
4556		-
4557		- // Mark as tracked
4558		- $link.attr('data-tracked', 'true');
4559		-
4560	4612	// Get bot ID from the chat box context
4561	4613	var botId = getBotIdFromElement(this);
4562	4614
4563	4615	// Get message context from the message div
		@@ -4562,28 +4614,12 @@
4562	4614
4563	4615	// Get message context from the message div
4564	4616	const messageText = messageDiv.text().substring(0, 200);
4565	4617
4566		- $.ajax({
4567		- url: mxchatChat.ajax_url,
4568		- type: 'POST',
4569		- data: {
4570		- action: 'mxchat_track_url_click',
4571		- session_id: getChatSession(botId),
4572		- url: originalHref,
4573		- message_context: messageText,
4574		- nonce: mxchatChat.nonce
4575		- },
4576		- complete: function() {
4577		- if ($link.attr('target') === '_blank' || linkTarget === '_blank') {
4578		- window.open(originalHref, '_blank');
4579		- } else {
4580		- window.location.href = originalHref;
4581		- }
4582		- }
4583		- });
4584		-
4585		- return false;
	4618	+ // Same path as attachLinkTracking(): set the target, record the
	4619	+ // click, and let the browser follow the anchor.
	4620	+ prepareTrackedLink($link);
	4621	+ trackLinkClick(originalHref, messageText, botId);
4586	4622	}
4587	4623	}
4588	4624	});
4589	4625