Changeset 3724923 for mxchat-basic/trunk/js/chat-script.js

Timestamp:

10/02/2026 01:56:12 PM (4 weeks ago)

Author:

mxchat

Message:

Release 3.2.24 - Safari links in replies now open; Slack live-agent delivery is reported honestly and no longer prefixed with stray characters; uploaded documents and PDFs are named properly, can carry a Source URL and no longer duplicate on re-upload; digit-led part numbers work again on a Pinecone document index; Custom Provider embeddings supported through the REST API and index sizing; WooCommerce product tags indexed; personal data export covers pre-chat form visitors; new Re-import affected entries tool

File:

• mxchat-basic/trunk/js/chat-script.js (modified) (8 diffs)

mxchat-basic/trunk/js/chat-script.js

@@ -1308 +1308 @@
     // Server-pushed html to append as its OWN bot bubble once the stream
     // finishes (e.g. the consent-safe YouTube embed, plan 03ba33). Rendering is
-    // deferred to [DONE] so the embed always lands BELOW the streamed text.
+    // deferred to the end of the stream so the embed always lands BELOW the
+    // streamed text.
     let pendingAppendHtml = '';
+
+    // Render the stashed appendix as its own bot bubble below the streamed
+    // text — mirrors how it is saved in the transcript, so history replays
+    // identically. Called from BOTH ends of a stream: the [DONE] line and
+    // the stream simply closing (the OpenAI Responses path and Gemini end
+    // without a [DONE] line). The stash is cleared, so a stream that sends
+    // [DONE] and then closes renders it once. Any future appendix-type
+    // event belongs in here, not in one of the two branches.
+    function flushAppendHtml() {
+        if (pendingAppendHtml) {
+            appendMessage("bot", "", pendingAppendHtml, [], false, botId);
+            pendingAppendHtml = '';
+        }
+    }
 
     // Abortable stream: a fresh controller per turn, keyed by bot instance.
@@ -1393 +1408 @@
                     enableChatInput(botId);
 
+                    flushAppendHtml();
+
                     // Scroll the user's last message to the top now that the
                     // bot's full reply has rendered (gives max reading room).
@@ -1425 +1442 @@
                             enableChatInput(botId);
 
-                            // Render any server-pushed appendix html (e.g. the
-                            // YouTube embed) as its own bot bubble below the
-                            // streamed text — mirrors how it is saved in the
-                            // transcript, so history replays identically.
-                            if (pendingAppendHtml) {
-                                appendMessage("bot", "", pendingAppendHtml, [], false, botId);
-                                pendingAppendHtml = '';
-                            }
+                            flushAppendHtml();
 
                             // Scroll the user's last message to the top now
@@ -2253 +2263 @@
 }
 
+// Link clicks in bot and agent messages: the click is recorded, the browser
+// follows the anchor itself. Navigation must not wait for the tracking
+// request: a window.open() made from that request's callback is outside the
+// visitor's tap, and Safari's pop-up blocker drops it without a message.
+
+// Give a tracked anchor the target it should open in, and noopener on a new tab.
+function prepareTrackedLink($link) {
+    if (linkTarget === '_blank' && $link.attr('target') !== '_blank') {
+        $link.attr('target', '_blank');
+    }
+    if ($link.attr('target') === '_blank') {
+        var rel = $link.attr('rel') || '';
+        if (!/(^|\s)noopener(\s|$)/.test(rel)) {
+            $link.attr('rel', $.trim(rel + ' noopener'));
+        }
+    }
+}
+
+// Record one click, fire-and-forget. sendBeacon survives the page unloading
+// when the link opens in the same tab.
+function trackLinkClick(href, messageContext, botId) {
+    var fields = {
+        action: 'mxchat_track_url_click',
+        session_id: getChatSession(botId),
+        url: href,
+        message_context: messageContext,
+        nonce: mxchatChat.nonce
+    };
+    try {
+        if (navigator.sendBeacon && typeof FormData !== 'undefined') {
+            var body = new FormData();
+            $.each(fields, function(name, value) {
+                body.append(name, value == null ? '' : value);
+            });
+            if (navigator.sendBeacon(mxchatChat.ajax_url, body)) {
+                return;
+            }
+        }
+    } catch (error) {
+        // Fall through to the plain request
+    }
+    $.ajax({
+        url: mxchatChat.ajax_url,
+        type: 'POST',
+        data: fields
+    });
+}
+
 //   Helper function to attach link tracking with proper event handling
 function attachLinkTracking(messageDiv, messageText, botId) {
@@ -2272 +2330 @@
                 $link.off('click.tracking');
 
+                // The anchor carries its own target: the browser follows it
+                prepareTrackedLink($link);
+
                 // Add new click handler with namespace
                 $link.on('click.tracking', function(e) {
-                    e.preventDefault();
                     e.stopPropagation();
 
@@ -2281 +2341 @@
                         : '';
 
-                    // Track the click
-                    $.ajax({
-                        url: mxchatChat.ajax_url,
-                        type: 'POST',
-                        data: {
-                            action: 'mxchat_track_url_click',
-                            session_id: getChatSession(botId),
-                            url: originalHref,
-                            message_context: messageContext,
-                            nonce: mxchatChat.nonce
-                        },
-                        complete: function() {
-                            // Always redirect, even if tracking fails
-                            if ($link.attr('target') === '_blank' || linkTarget === '_blank') {
-                                window.open(originalHref, '_blank');
-                            } else {
-                                window.location.href = originalHref;
-                            }
-                        }
-                    });
-
-                    return false; // Extra insurance to prevent default
+                    prepareTrackedLink($link);
+                    trackLinkClick(originalHref, messageContext, botId);
                 });
             }
@@ -4552 +4592 @@
 
         if (originalHref && (originalHref.startsWith('http://') || originalHref.startsWith('https://'))) {
-            e.preventDefault();
-            e.stopPropagation();
-
-            // Mark as tracked
-            $link.attr('data-tracked', 'true');
-
             // Get bot ID from the chat box context
             var botId = getBotIdFromElement(this);
@@ -4564 +4598 @@
             const messageText = messageDiv.text().substring(0, 200);
 
-            $.ajax({
-                url: mxchatChat.ajax_url,
-                type: 'POST',
-                data: {
-                    action: 'mxchat_track_url_click',
-                    session_id: getChatSession(botId),
-                    url: originalHref,
-                    message_context: messageText,
-                    nonce: mxchatChat.nonce
-                },
-                complete: function() {
-                    if ($link.attr('target') === '_blank' || linkTarget === '_blank') {
-                        window.open(originalHref, '_blank');
-                    } else {
-                        window.location.href = originalHref;
-                    }
-                }
-            });
-
-            return false;
+            // Same path as attachLinkTracking(): set the target, record the
+            // click, and let the browser follow the anchor.
+            prepareTrackedLink($link);
+            trackLinkClick(originalHref, messageText, botId);
         }
     }