| @@ -1,228 +1,12 @@ | ||
| 1 | 1 | jQuery(document).ready(function($) { |
| 2 | - | |
| 3 | - // Nonce refresh is deferred until first user interaction (ensureSession) | |
| 4 | - // to avoid admin-ajax calls on passive page loads. | |
| 5 | - var nonceRefreshed = false; | |
| 6 | - function refreshNonceIfNeeded(callback) { | |
| 7 | - if (nonceRefreshed || typeof mxchatChat === 'undefined' || !mxchatChat.ajax_url) { | |
| 8 | - if (callback) callback(); | |
| 9 | - return; | |
| 10 | - } | |
| 11 | - nonceRefreshed = true; | |
| 12 | - $.post(mxchatChat.ajax_url, { action: 'mxchat_refresh_nonce' }, function(res) { | |
| 13 | - if (res && res.success && res.data && res.data.nonce) { | |
| 14 | - mxchatChat.nonce = res.data.nonce; | |
| 15 | - } | |
| 16 | - if (callback) callback(); | |
| 17 | - }); | |
| 18 | - } | |
| 19 | - | |
| 2 | + | |
| 20 | 3 | // ==================================== |
| 21 | - // MULTI-INSTANCE MANAGEMENT SYSTEM | |
| 22 | - // ==================================== | |
| 23 | - | |
| 24 | - // Instance registry - tracks all chatbot instances on the page | |
| 25 | - const MxChatInstances = { | |
| 26 | - instances: {}, | |
| 27 | - | |
| 28 | - // Initialize an instance for a bot | |
| 29 | - init: function(botId) { | |
| 30 | - if (!this.instances[botId]) { | |
| 31 | - // When persistence is OFF, track when this session started | |
| 32 | - // so the AI only sees messages from this page load | |
| 33 | - var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on'; | |
| 34 | - | |
| 35 | - this.instances[botId] = { | |
| 36 | - botId: botId, | |
| 37 | - sessionId: null, | |
| 38 | - lastSeenMessageId: '', | |
| 39 | - notificationCheckInterval: null, | |
| 40 | - pollingInterval: null, | |
| 41 | - processedMessageIds: new Set(), | |
| 42 | - activePdfFile: null, | |
| 43 | - activeWordFile: null, | |
| 44 | - chatHistoryLoaded: false, | |
| 45 | - isStreaming: false, | |
| 46 | - // Fresh context timestamp - only used when persistence is OFF | |
| 47 | - sessionStartTimestamp: chatPersistenceEnabled ? 0 : Date.now() | |
| 48 | - }; | |
| 49 | - } | |
| 50 | - return this.instances[botId]; | |
| 51 | - }, | |
| 52 | - | |
| 53 | - // Get instance by botId | |
| 54 | - get: function(botId) { | |
| 55 | - return this.instances[botId] || this.init(botId); | |
| 56 | - }, | |
| 57 | - | |
| 58 | - // Get all active bot IDs | |
| 59 | - getAllBotIds: function() { | |
| 60 | - return Object.keys(this.instances); | |
| 61 | - }, | |
| 62 | - | |
| 63 | - // Session management per bot | |
| 64 | - // Returns existing session ID from cookie or localStorage (with in-memory fallback), | |
| 65 | - // or null if none exists. Does NOT create a new session — use ensureSession() for that. | |
| 66 | - getChatSession: function(botId) { | |
| 67 | - var cookieName = 'mxchat_session_id_' + botId; | |
| 68 | - var storageKey = 'mxchat_session_id_' + botId; | |
| 69 | - var sessionId = getCookie(cookieName); | |
| 70 | - | |
| 71 | - // Fallback to localStorage if cookie is missing (e.g. cleared by browser/consent) | |
| 72 | - if (!sessionId) { | |
| 73 | - try { sessionId = localStorage.getItem(storageKey); } catch (e) {} | |
| 74 | - } | |
| 75 | - | |
| 76 | - // Fallback to in-memory instance when cookie AND localStorage are both blocked | |
| 77 | - // (Safari ITP, strict tracking prevention, cross-origin iframes with partitioned | |
| 78 | - // storage). Without this, ensureSession() can generate and store an ID that | |
| 79 | - // getChatSession() then can't read back, causing null session_ids on send. | |
| 80 | - if (!sessionId && this.instances[botId] && this.instances[botId].sessionId) { | |
| 81 | - sessionId = this.instances[botId].sessionId; | |
| 82 | - } | |
| 83 | - | |
| 84 | - // Guard against stored sentinel values that indicate earlier broken writes. | |
| 85 | - if (sessionId === 'null' || sessionId === 'undefined') { | |
| 86 | - sessionId = null; | |
| 87 | - } | |
| 88 | - | |
| 89 | - // Re-sync cookie from localStorage if cookie was lost | |
| 90 | - if (sessionId && !getCookie(cookieName)) { | |
| 91 | - document.cookie = cookieName + "=" + sessionId + "; path=/; max-age=86400; SameSite=Lax"; | |
| 92 | - } | |
| 93 | - | |
| 94 | - return sessionId || null; | |
| 95 | - }, | |
| 96 | - | |
| 97 | - // Lazy session initializer — called on first user interaction | |
| 98 | - ensureSession: function(botId) { | |
| 99 | - botId = botId || 'default'; | |
| 100 | - var instance = this.instances[botId] || this.init(botId); | |
| 101 | - | |
| 102 | - if (instance.sessionId) { | |
| 103 | - return instance.sessionId; | |
| 104 | - } | |
| 105 | - | |
| 106 | - // Check for existing session from cookie or localStorage | |
| 107 | - var existingSession = this.getChatSession(botId); | |
| 108 | - | |
| 109 | - if (existingSession) { | |
| 110 | - instance.sessionId = existingSession; | |
| 111 | - } else { | |
| 112 | - // Brand new session | |
| 113 | - var newId = generateSessionId(); | |
| 114 | - this.setChatSession(botId, newId); | |
| 115 | - instance.sessionId = newId; | |
| 116 | - } | |
| 117 | - | |
| 118 | - // Now that we have a session, do the deferred work | |
| 119 | - refreshNonceIfNeeded(); | |
| 120 | - trackOriginatingPage(); | |
| 121 | - | |
| 122 | - // Note: loadChatHistory is handled by showChatContainerForBot with loader UI, | |
| 123 | - // so we do NOT call it here to avoid a race condition. | |
| 124 | - | |
| 125 | - return instance.sessionId; | |
| 126 | - }, | |
| 127 | - | |
| 128 | - setChatSession: function(botId, sessionId) { | |
| 129 | - var cookieName = 'mxchat_session_id_' + botId; | |
| 130 | - var storageKey = 'mxchat_session_id_' + botId; | |
| 131 | - document.cookie = cookieName + "=" + sessionId + "; path=/; max-age=86400; SameSite=Lax"; | |
| 132 | - try { localStorage.setItem(storageKey, sessionId); } catch (e) {} | |
| 133 | - if (this.instances[botId]) { | |
| 134 | - this.instances[botId].sessionId = sessionId; | |
| 135 | - } | |
| 136 | - }, | |
| 137 | - | |
| 138 | - resetChatSession: function(botId) { | |
| 139 | - // Clear old session from localStorage before setting new one | |
| 140 | - try { localStorage.removeItem('mxchat_session_id_' + botId); } catch (e) {} | |
| 141 | - var newSessionId = generateSessionId(); | |
| 142 | - this.setChatSession(botId, newSessionId); | |
| 143 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 144 | - if ($chatBox.length) { | |
| 145 | - $chatBox.find('.user-message, .bot-message:not(:first), .agent-message').remove(); | |
| 146 | - } | |
| 147 | - if (this.instances[botId]) { | |
| 148 | - this.instances[botId].chatHistoryLoaded = false; | |
| 149 | - this.instances[botId].processedMessageIds = new Set(); | |
| 150 | - } | |
| 151 | - }, | |
| 152 | - | |
| 153 | - // Silent reset — new session ID without clearing the chat UI | |
| 154 | - // Used when IP changes mid-conversation so the user doesn't see messages vanish | |
| 155 | - silentResetSession: function(botId) { | |
| 156 | - try { localStorage.removeItem('mxchat_session_id_' + botId); } catch (e) {} | |
| 157 | - var newSessionId = generateSessionId(); | |
| 158 | - this.setChatSession(botId, newSessionId); | |
| 159 | - if (this.instances[botId]) { | |
| 160 | - this.instances[botId].sessionId = newSessionId; | |
| 161 | - } | |
| 162 | - return newSessionId; | |
| 163 | - } | |
| 164 | - }; | |
| 165 | - | |
| 166 | - // ==================================== | |
| 167 | - // ELEMENT SELECTOR HELPERS | |
| 168 | - // ==================================== | |
| 169 | - | |
| 170 | - // Check if a specific bot has an AI theme assigned (skip inline colors) | |
| 171 | - function shouldSkipInlineColors(botId) { | |
| 172 | - // If global AI theme is active, skip inline colors for all bots | |
| 173 | - if (mxchatChat.skip_inline_colors) { | |
| 174 | - return true; | |
| 175 | - } | |
| 176 | - // Check if this specific bot has a theme assignment | |
| 177 | - var botAssignments = mxchatChat.bot_theme_assignments || {}; | |
| 178 | - return botAssignments.hasOwnProperty(botId); | |
| 179 | - } | |
| 180 | - | |
| 181 | - // Get element by ID with bot suffix - returns jQuery object | |
| 182 | - function getElement(botId, elementName) { | |
| 183 | - return $('#' + elementName + '-' + botId); | |
| 184 | - } | |
| 185 | - | |
| 186 | - // Get element by ID with bot suffix - returns DOM element | |
| 187 | - function getElementDOM(botId, elementName) { | |
| 188 | - return document.getElementById(elementName + '-' + botId); | |
| 189 | - } | |
| 190 | - | |
| 191 | - // Get bot ID from any element within a chatbot instance | |
| 192 | - function getBotIdFromElement(element) { | |
| 193 | - var $wrapper = $(element).closest('.mxchat-chatbot-wrapper'); | |
| 194 | - if ($wrapper.length) { | |
| 195 | - return $wrapper.data('bot-id') || 'default'; | |
| 196 | - } | |
| 197 | - // Fallback: try to find from floating container | |
| 198 | - var $floating = $(element).closest('.floating-chatbot'); | |
| 199 | - if ($floating.length) { | |
| 200 | - var id = $floating.attr('id') || ''; | |
| 201 | - var match = id.match(/floating-chatbot-(.+)/); | |
| 202 | - if (match) return match[1]; | |
| 203 | - } | |
| 204 | - // Fallback: check if element itself has an ID with bot suffix (e.g., floating-chatbot-button-{bot_id}) | |
| 205 | - var elementId = $(element).attr('id') || ''; | |
| 206 | - if (elementId) { | |
| 207 | - // Match patterns like: floating-chatbot-button-{bot_id}, pre-chat-message-{bot_id} | |
| 208 | - var idMatch = elementId.match(/^(?:floating-chatbot-button|pre-chat-message|chat-notification-badge)-(.+)$/); | |
| 209 | - if (idMatch) return idMatch[1]; | |
| 210 | - } | |
| 211 | - return 'default'; | |
| 212 | - } | |
| 213 | - | |
| 214 | - // Get wrapper element for a bot | |
| 215 | - function getWrapper(botId) { | |
| 216 | - return getElement(botId, 'mxchat-chatbot-wrapper'); | |
| 217 | - } | |
| 218 | - | |
| 219 | - // ==================================== | |
| 220 | 4 | // GLOBAL VARIABLES & CONFIGURATION |
| 221 | 5 | // ==================================== |
| 222 | 6 | const toolbarIconColor = mxchatChat.toolbar_icon_color || '#212121'; |
| 223 | - | |
| 224 | - // Initialize color settings (these are global as they come from PHP) | |
| 7 | + | |
| 8 | + // Initialize color settings | |
| 225 | 9 | var userMessageBgColor = mxchatChat.user_message_bg_color; |
| 226 | 10 | var userMessageFontColor = mxchatChat.user_message_font_color; |
| 227 | 11 | var botMessageBgColor = mxchatChat.bot_message_bg_color; |
| 228 | 12 | var botMessageFontColor = mxchatChat.bot_message_font_color; |
| @@ -227,64 +11,53 @@ | ||
| 227 | 11 | var botMessageBgColor = mxchatChat.bot_message_bg_color; |
| 228 | 12 | var botMessageFontColor = mxchatChat.bot_message_font_color; |
| 229 | 13 | var liveAgentMessageBgColor = mxchatChat.live_agent_message_bg_color; |
| 230 | 14 | var liveAgentMessageFontColor = mxchatChat.live_agent_message_font_color; |
| 15 | + | |
| 16 | + var linkTarget = mxchatChat.link_target_toggle === 'on' ? '_blank' : '_self'; | |
| 17 | + let lastSeenMessageId = ''; | |
| 18 | + let notificationCheckInterval; | |
| 19 | + let notificationBadge; | |
| 20 | + var sessionId = getChatSession(); | |
| 21 | + let pollingInterval; | |
| 22 | + let processedMessageIds = new Set(); | |
| 23 | + let activePdfFile = null; | |
| 24 | + let activeWordFile = null; | |
| 231 | 25 | |
| 232 | - var linkTarget = mxchatChat.link_target_toggle === 'on' ? '_blank' : '_self'; | |
| 233 | 26 | |
| 234 | 27 | // ==================================== |
| 235 | - // SESSION MANAGEMENT (Legacy compatibility) | |
| 28 | + // SESSION MANAGEMENT | |
| 236 | 29 | // ==================================== |
| 237 | - | |
| 30 | + | |
| 31 | + function getChatSession() { | |
| 32 | + var sessionId = getCookie('mxchat_session_id'); | |
| 33 | + //console.log("Session ID retrieved from cookie: ", sessionId); | |
| 34 | + | |
| 35 | + if (!sessionId) { | |
| 36 | + sessionId = generateSessionId(); | |
| 37 | + //console.log("Generated new session ID: ", sessionId); | |
| 38 | + setChatSession(sessionId); | |
| 39 | + } | |
| 40 | + | |
| 41 | + //console.log("Final session ID: ", sessionId); | |
| 42 | + return sessionId; | |
| 43 | + } | |
| 44 | + | |
| 45 | + function setChatSession(sessionId) { | |
| 46 | + // Set the cookie with a 24-hour expiration (86400 seconds) | |
| 47 | + document.cookie = "mxchat_session_id=" + sessionId + "; path=/; max-age=86400; SameSite=Lax"; | |
| 48 | + } | |
| 49 | + | |
| 238 | 50 | function getCookie(name) { |
| 239 | 51 | let value = "; " + document.cookie; |
| 240 | 52 | let parts = value.split("; " + name + "="); |
| 241 | 53 | if (parts.length == 2) return parts.pop().split(";").shift(); |
| 242 | 54 | } |
| 243 | - | |
| 55 | + | |
| 244 | 56 | function generateSessionId() { |
| 245 | 57 | return 'mxchat_chat_' + Math.random().toString(36).substr(2, 9); |
| 246 | 58 | } |
| 247 | 59 | |
| 248 | - // Legacy function - now delegates to instance manager | |
| 249 | - function getChatSession(botId) { | |
| 250 | - botId = botId || 'default'; | |
| 251 | - return MxChatInstances.getChatSession(botId); | |
| 252 | - } | |
| 253 | - | |
| 254 | - function setChatSession(sessionId, botId) { | |
| 255 | - botId = botId || 'default'; | |
| 256 | - MxChatInstances.setChatSession(botId, sessionId); | |
| 257 | - } | |
| 258 | - | |
| 259 | - function resetChatSession(botId) { | |
| 260 | - botId = botId || 'default'; | |
| 261 | - MxChatInstances.resetChatSession(botId); | |
| 262 | - } | |
| 263 | - | |
| 264 | - // ==================================== | |
| 265 | - // INITIALIZE ALL CHATBOT INSTANCES | |
| 266 | - // ==================================== | |
| 267 | - | |
| 268 | - function initializeAllInstances() { | |
| 269 | - // Find all chatbot wrappers on the page | |
| 270 | - $('.mxchat-chatbot-wrapper').each(function() { | |
| 271 | - var botId = $(this).data('bot-id') || 'default'; | |
| 272 | - MxChatInstances.init(botId); | |
| 273 | - initializeBotInstance(botId); | |
| 274 | - }); | |
| 275 | - } | |
| 276 | - | |
| 277 | - function initializeBotInstance(botId) { | |
| 278 | - var instance = MxChatInstances.get(botId); | |
| 279 | - | |
| 280 | - // Initialize quick questions state for this bot | |
| 281 | - checkQuickQuestionsState(botId); | |
| 282 | - | |
| 283 | - // Note: Event handlers use event delegation with class selectors, | |
| 284 | - // so they work automatically for all instances without per-bot setup | |
| 285 | - } | |
| 286 | - | |
| 287 | 60 | // ==================================== |
| 288 | 61 | // CONTEXTUAL AWARENESS FUNCTIONALITY |
| 289 | 62 | // ==================================== |
| 290 | 63 | |
| @@ -360,9 +133,9 @@ | ||
| 360 | 133 | const elements = clone.querySelectorAll(selector); |
| 361 | 134 | elements.forEach(el => el.remove()); |
| 362 | 135 | }); |
| 363 | 136 | |
| 364 | - // Extract MxChat context data attributes before getting text content | |
| 137 | + // NEW: Extract MxChat context data attributes before getting text content | |
| 365 | 138 | const contextData = []; |
| 366 | 139 | clone.querySelectorAll('[data-mxchat-context]').forEach(el => { |
| 367 | 140 | const contextValue = el.dataset.mxchatContext; |
| 368 | 141 | if (contextValue && contextValue.trim()) { |
| @@ -396,9 +169,9 @@ | ||
| 396 | 169 | content: pageContent |
| 397 | 170 | }; |
| 398 | 171 | } |
| 399 | 172 | |
| 400 | -// Track originating page when chat starts | |
| 173 | +// NEW: Track originating page when chat starts | |
| 401 | 174 | function trackOriginatingPage() { |
| 402 | 175 | const sessionId = getChatSession(); |
| 403 | 176 | const pageUrl = window.location.href; |
| 404 | 177 | const pageTitle = document.title || 'Untitled Page'; |
| @@ -429,123 +202,70 @@ | ||
| 429 | 202 | |
| 430 | 203 | // ==================================== |
| 431 | 204 | // CORE CHAT FUNCTIONALITY |
| 432 | 205 | // ==================================== |
| 433 | - | |
| 434 | -// Helper functions to disable/enable chat input while waiting for response | |
| 435 | -function disableChatInput(botId) { | |
| 436 | - botId = botId || 'default'; | |
| 437 | - var chatInput = getElementDOM(botId, 'chat-input'); | |
| 438 | - var sendButton = getElementDOM(botId, 'send-button'); | |
| 439 | - if (chatInput) { | |
| 440 | - chatInput.disabled = true; | |
| 441 | - chatInput.style.opacity = '0.6'; | |
| 442 | - } | |
| 443 | - if (sendButton) { | |
| 444 | - sendButton.disabled = true; | |
| 445 | - sendButton.style.opacity = '0.5'; | |
| 446 | - sendButton.style.pointerEvents = 'none'; | |
| 447 | - } | |
| 448 | -} | |
| 449 | - | |
| 450 | -function enableChatInput(botId) { | |
| 451 | - botId = botId || 'default'; | |
| 452 | - var chatInput = getElementDOM(botId, 'chat-input'); | |
| 453 | - var sendButton = getElementDOM(botId, 'send-button'); | |
| 454 | - if (chatInput) { | |
| 455 | - chatInput.disabled = false; | |
| 456 | - chatInput.style.opacity = '1'; | |
| 457 | - chatInput.focus(); | |
| 458 | - } | |
| 459 | - if (sendButton) { | |
| 460 | - sendButton.disabled = false; | |
| 461 | - sendButton.style.opacity = '1'; | |
| 462 | - sendButton.style.pointerEvents = 'auto'; | |
| 463 | - } | |
| 464 | -} | |
| 465 | - | |
| 466 | 206 | // Update your existing sendMessage function |
| 467 | -function sendMessage(botId) { | |
| 468 | - botId = botId || 'default'; | |
| 469 | - MxChatInstances.ensureSession(botId); | |
| 470 | - var $chatInput = getElement(botId, 'chat-input'); | |
| 471 | - var message = $chatInput.val(); | |
| 472 | - | |
| 207 | +function sendMessage() { | |
| 208 | + var message = $('#chat-input').val(); | |
| 209 | + | |
| 473 | 210 | // ADD PROMPT HOOK HERE |
| 474 | - if (typeof customMxChatFilter === 'function') { | |
| 475 | - message = customMxChatFilter(message, "prompt"); | |
| 211 | + if (typeof customMxChatFilter === 'function') { | |
| 212 | + message = customMxChatFilter(message, "prompt"); | |
| 476 | 213 | } |
| 477 | - | |
| 214 | + | |
| 478 | 215 | if (message) { |
| 479 | - // Don't disable input in live agent mode - let users chat freely | |
| 480 | - var modeIndicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 481 | - var isAgentMode = modeIndicator && modeIndicator.textContent === 'Live Agent'; | |
| 482 | - if (!isAgentMode) { | |
| 483 | - disableChatInput(botId); | |
| 484 | - } | |
| 216 | + appendMessage("user", message); | |
| 217 | + $('#chat-input').val(''); | |
| 218 | + $('#chat-input').css('height', 'auto'); | |
| 485 | 219 | |
| 486 | - appendMessage("user", message, '', [], false, botId); | |
| 487 | - $chatInput.val(''); | |
| 488 | - $chatInput.css('height', 'auto'); | |
| 489 | - | |
| 490 | - if (hasQuickQuestions(botId)) { | |
| 491 | - collapseQuickQuestions(botId); | |
| 220 | + if (hasQuickQuestions()) { | |
| 221 | + collapseQuickQuestions(); | |
| 492 | 222 | } |
| 493 | - appendThinkingMessage(botId); | |
| 494 | - scrollToBottom(botId); | |
| 223 | + appendThinkingMessage(); | |
| 224 | + scrollToBottom(); | |
| 495 | 225 | |
| 496 | - const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest'; | |
| 226 | + const currentModel = mxchatChat.model || 'gpt-4o'; | |
| 497 | 227 | |
| 498 | 228 | // Check if streaming is enabled AND supported for this model |
| 499 | 229 | if (shouldUseStreaming(currentModel)) { |
| 500 | 230 | callMxChatStream(message, function(response) { |
| 501 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').removeClass('temporary-message'); | |
| 502 | - }, botId); | |
| 231 | + $('.bot-message.temporary-message').removeClass('temporary-message'); | |
| 232 | + }); | |
| 503 | 233 | } else { |
| 504 | 234 | callMxChat(message, function(response) { |
| 505 | - replaceLastMessage("bot", response, '', [], botId); | |
| 506 | - }, botId); | |
| 235 | + replaceLastMessage("bot", response); | |
| 236 | + }); | |
| 507 | 237 | } |
| 508 | 238 | } |
| 509 | 239 | } |
| 510 | 240 | |
| 511 | 241 | // Update your existing sendMessageToChatbot function |
| 512 | -function sendMessageToChatbot(message, botId) { | |
| 513 | - botId = botId || 'default'; | |
| 514 | - MxChatInstances.ensureSession(botId); | |
| 515 | - | |
| 242 | +function sendMessageToChatbot(message) { | |
| 516 | 243 | // ADD PROMPT HOOK HERE |
| 517 | 244 | if (typeof customMxChatFilter === 'function') { |
| 518 | 245 | message = customMxChatFilter(message, "prompt"); |
| 519 | 246 | } |
| 247 | + | |
| 248 | + var sessionId = getChatSession(); | |
| 520 | 249 | |
| 521 | - // Don't disable input in live agent mode - let users chat freely | |
| 522 | - var modeIndicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 523 | - var isAgentMode = modeIndicator && modeIndicator.textContent === 'Live Agent'; | |
| 524 | - if (!isAgentMode) { | |
| 525 | - disableChatInput(botId); | |
| 250 | + if (hasQuickQuestions()) { | |
| 251 | + collapseQuickQuestions(); | |
| 526 | 252 | } |
| 253 | + appendThinkingMessage(); | |
| 254 | + scrollToBottom(); | |
| 527 | 255 | |
| 528 | - var sessionId = getChatSession(botId); | |
| 256 | + const currentModel = mxchatChat.model || 'gpt-4o'; | |
| 529 | 257 | |
| 530 | - if (hasQuickQuestions(botId)) { | |
| 531 | - collapseQuickQuestions(botId); | |
| 532 | - } | |
| 533 | - appendThinkingMessage(botId); | |
| 534 | - scrollToBottom(botId); | |
| 535 | - | |
| 536 | - const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest'; | |
| 537 | - | |
| 538 | 258 | // Check if streaming is enabled AND supported for this model |
| 539 | 259 | if (shouldUseStreaming(currentModel)) { |
| 540 | 260 | callMxChatStream(message, function(response) { |
| 541 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').removeClass('temporary-message'); | |
| 542 | - }, botId); | |
| 261 | + $('.bot-message.temporary-message').removeClass('temporary-message'); | |
| 262 | + }); | |
| 543 | 263 | } else { |
| 544 | 264 | callMxChat(message, function(response) { |
| 545 | - getElement(botId, 'chat-box').find('.temporary-message').remove(); | |
| 546 | - replaceLastMessage("bot", response, '', [], botId); | |
| 547 | - }, botId); | |
| 265 | + $('.temporary-message').remove(); | |
| 266 | + replaceLastMessage("bot", response); | |
| 267 | + }); | |
| 548 | 268 | } |
| 549 | 269 | } |
| 550 | 270 | |
| 551 | 271 | // Updated shouldUseStreaming function with debugging |
| @@ -560,81 +280,20 @@ | ||
| 560 | 280 | // Only use streaming if both enabled and supported |
| 561 | 281 | return streamingEnabled && streamingSupported; |
| 562 | 282 | } |
| 563 | 283 | |
| 564 | -// Helper function to handle chat mode updates | |
| 565 | -function handleChatModeUpdates(response, responseText) { | |
| 566 | - // Check for explicit chat mode in response (THIS IS THE KEY FIX) | |
| 567 | - if (response.chat_mode) { | |
| 568 | - updateChatModeIndicator(response.chat_mode); | |
| 569 | - return; // Return early since we found explicit mode | |
| 570 | - } | |
| 571 | - // Check for fallback response chat mode | |
| 572 | - else if (response.fallbackResponse && response.fallbackResponse.chat_mode) { | |
| 573 | - updateChatModeIndicator(response.fallbackResponse.chat_mode); | |
| 574 | - return; // Return early since we found explicit mode | |
| 575 | - } | |
| 576 | - | |
| 577 | - // Only do text-based detection if no explicit mode was provided | |
| 578 | - // Check for specific AI chatbot response text | |
| 579 | - if (responseText === 'You are now chatting with the AI chatbot.' || | |
| 580 | - responseText.includes('now chatting with the AI') || | |
| 581 | - responseText.includes('switched to AI mode') || | |
| 582 | - responseText.includes('AI chatbot is now')) { | |
| 583 | - updateChatModeIndicator('ai'); | |
| 584 | - } | |
| 585 | - // Check for agent transfer messages | |
| 586 | - else if (responseText.includes('agent') && | |
| 587 | - (responseText.includes('transfer') || responseText.includes('connected'))) { | |
| 588 | - updateChatModeIndicator('agent'); | |
| 589 | - } | |
| 590 | -} | |
| 591 | - | |
| 592 | -// Function to get bot ID from any element or wrapper | |
| 593 | -// If element is provided, finds the bot ID from its wrapper | |
| 594 | -// If no element, returns 'default' (for backward compatibility) | |
| 595 | -function getMxChatBotId(element) { | |
| 596 | - if (element) { | |
| 597 | - return getBotIdFromElement(element); | |
| 598 | - } | |
| 599 | - // Fallback: find first chatbot wrapper on page | |
| 600 | - const chatbotWrapper = document.querySelector('.mxchat-chatbot-wrapper'); | |
| 601 | - return chatbotWrapper ? chatbotWrapper.getAttribute('data-bot-id') || 'default' : 'default'; | |
| 602 | -} | |
| 603 | - | |
| 604 | -function callMxChat(message, callback, botId) { | |
| 605 | - botId = botId || getMxChatBotId(); | |
| 606 | - | |
| 607 | - // Store the message in case we need to retry after session reset | |
| 608 | - getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', message); | |
| 609 | - | |
| 284 | +function callMxChat(message, callback) { | |
| 610 | 285 | // Get page context if contextual awareness is enabled |
| 611 | 286 | const pageContext = getPageContext(); |
| 612 | - | |
| 613 | - // Get instance for session start timestamp (used when persistence is OFF) | |
| 614 | - var instance = MxChatInstances.get(botId); | |
| 615 | - | |
| 616 | - // Guarantee a non-null session_id before the AJAX leaves. ensureSession() is idempotent | |
| 617 | - // and returns the guaranteed-present session id from the in-memory instance even when | |
| 618 | - // cookie/localStorage writes are silently blocked by the browser. | |
| 619 | - var sessionId = MxChatInstances.ensureSession(botId); | |
| 620 | - if (!sessionId || sessionId === 'null' || sessionId === 'undefined') { | |
| 621 | - // Last-resort generation to ensure we never POST a null marker. | |
| 622 | - sessionId = generateSessionId(); | |
| 623 | - MxChatInstances.setChatSession(botId, sessionId); | |
| 624 | - } | |
| 625 | - | |
| 287 | + | |
| 626 | 288 | // Prepare AJAX data |
| 627 | 289 | const ajaxData = { |
| 628 | 290 | action: 'mxchat_handle_chat_request', |
| 629 | 291 | message: message, |
| 630 | - session_id: sessionId, | |
| 292 | + session_id: getChatSession(), | |
| 631 | 293 | nonce: mxchatChat.nonce, |
| 632 | - current_page_url: window.location.href, | |
| 633 | - current_page_title: document.title, | |
| 634 | - bot_id: botId, | |
| 635 | - // Pass session start timestamp so AI context matches what user sees | |
| 636 | - session_start_timestamp: instance.sessionStartTimestamp || 0 | |
| 294 | + current_page_url: window.location.href, | |
| 295 | + current_page_title: document.title | |
| 637 | 296 | }; |
| 638 | 297 | |
| 639 | 298 | // Add page context if available |
| 640 | 299 | if (pageContext) { |
| @@ -657,98 +316,37 @@ | ||
| 657 | 316 | type: 'POST', |
| 658 | 317 | dataType: 'json', |
| 659 | 318 | data: ajaxData, |
| 660 | 319 | success: function(response) { |
| 661 | - // IMMEDIATE CHAT MODE UPDATE - This should be FIRST | |
| 662 | - if (response.chat_mode) { | |
| 663 | - updateChatModeIndicator(response.chat_mode, botId); | |
| 664 | - } | |
| 320 | + // Log the full response for debugging | |
| 321 | + //console.log("API Response:", response); | |
| 665 | 322 | |
| 666 | - // Also check in data property if response is wrapped | |
| 667 | - if (response.data && response.data.chat_mode) { | |
| 668 | - updateChatModeIndicator(response.data.chat_mode, botId); | |
| 669 | - } | |
| 670 | - | |
| 671 | - // SECURITY FIX: Check for errors FIRST before checking for success | |
| 672 | - // This ensures API errors (quota exceeded, invalid key, rate limit) are properly displayed | |
| 673 | - if (response.success === false || (response.data && response.data.error_message)) { | |
| 674 | - let errorMessage = ""; | |
| 675 | - let errorCode = ""; | |
| 676 | - | |
| 677 | - // Check various possible error locations in the response | |
| 678 | - if (response.data && response.data.error_message) { | |
| 679 | - errorMessage = response.data.error_message; | |
| 680 | - errorCode = response.data.error_code || ""; | |
| 681 | - } else if (response.error_message) { | |
| 682 | - errorMessage = response.error_message; | |
| 683 | - errorCode = response.error_code || ""; | |
| 684 | - } else if (response.message) { | |
| 685 | - errorMessage = response.message; | |
| 686 | - } else if (typeof response.data === 'string') { | |
| 687 | - errorMessage = response.data; | |
| 688 | - } else { | |
| 689 | - // Fallback for any other unexpected response format | |
| 690 | - errorMessage = "An error occurred. Please try again or contact support."; | |
| 691 | - } | |
| 692 | - | |
| 693 | - // Handle session reset action (IP changed, session expired, etc.) | |
| 694 | - // Silent reset — keep chat UI intact, just get a new session and retry | |
| 695 | - if (response.data && response.data.action === 'reset_session') { | |
| 696 | - MxChatInstances.silentResetSession(botId); | |
| 697 | - // Re-send the original message with the new session (user message is already displayed) | |
| 698 | - var originalMessage = getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message'); | |
| 699 | - if (originalMessage) { | |
| 700 | - getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', null); | |
| 701 | - var currentModel = mxchatChat.model || 'gpt-5.1-chat-latest'; | |
| 702 | - if (shouldUseStreaming(currentModel)) { | |
| 703 | - callMxChatStream(originalMessage, function(response) { | |
| 704 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').removeClass('temporary-message'); | |
| 705 | - }, botId); | |
| 706 | - } else { | |
| 707 | - callMxChat(originalMessage, function(response) { | |
| 708 | - replaceLastMessage("bot", response, '', [], botId); | |
| 709 | - }, botId); | |
| 710 | - } | |
| 711 | - } | |
| 712 | - return; | |
| 713 | - } | |
| 714 | - | |
| 715 | - // Format user-friendly error message | |
| 716 | - let displayMessage = errorMessage; | |
| 717 | - | |
| 718 | - // Customize message for admin users | |
| 719 | - if (mxchatChat.is_admin) { | |
| 720 | - // For admin users, show more technical details including error code | |
| 721 | - displayMessage = errorMessage + (errorCode ? " (Error code: " + errorCode + ")" : ""); | |
| 722 | - } | |
| 723 | - | |
| 724 | - replaceLastMessage("bot", displayMessage, '', [], botId); | |
| 725 | - return; // Exit early for errors | |
| 726 | - } | |
| 727 | - | |
| 728 | - // NOW check if this is a successful response by looking for text, html, or message fields | |
| 323 | + // First check if this is a successful response by looking for text, html, or message fields | |
| 729 | 324 | // This preserves compatibility with your server response format |
| 730 | - if (response.text !== undefined || response.html !== undefined || response.message !== undefined || | |
| 325 | + if (response.text !== undefined || response.html !== undefined || response.message !== undefined || | |
| 731 | 326 | (response.success === true && response.data && response.data.status === 'waiting_for_agent')) { |
| 732 | 327 | |
| 733 | 328 | // Handle successful response - this is your original success handling code |
| 734 | 329 | |
| 735 | - // Handle other responses | |
| 736 | - let responseText = response.text || ''; | |
| 737 | - let responseHtml = response.html || ''; | |
| 738 | - let responseMessage = response.message || ''; | |
| 330 | + // Existing chat mode check | |
| 331 | + if (response.chat_mode) { | |
| 332 | + updateChatModeIndicator(response.chat_mode); | |
| 333 | + } | |
| 334 | + else if (response.fallbackResponse && response.fallbackResponse.chat_mode) { | |
| 335 | + updateChatModeIndicator(response.fallbackResponse.chat_mode); | |
| 336 | + } | |
| 739 | 337 | |
| 740 | 338 | // Add PDF filename handling |
| 741 | 339 | if (response.data && response.data.filename) { |
| 742 | - showActivePdf(response.data.filename, botId); | |
| 743 | - var instance = MxChatInstances.get(botId); | |
| 744 | - instance.activePdfFile = response.data.filename; | |
| 340 | + showActivePdf(response.data.filename); | |
| 341 | + activePdfFile = response.data.filename; | |
| 745 | 342 | } |
| 746 | 343 | |
| 747 | 344 | // Add redirect check here |
| 748 | 345 | if (response.redirect_url) { |
| 346 | + let responseText = response.text || ''; | |
| 749 | 347 | if (responseText) { |
| 750 | - replaceLastMessage("bot", responseText, '', [], botId); | |
| 348 | + replaceLastMessage("bot", responseText); | |
| 751 | 349 | } |
| 752 | 350 | setTimeout(() => { |
| 753 | 351 | window.location.href = response.redirect_url; |
| 754 | 352 | }, 1500); |
| @@ -756,17 +354,24 @@ | ||
| 756 | 354 | } |
| 757 | 355 | |
| 758 | 356 | // Check for live agent response |
| 759 | 357 | if (response.success && response.data && response.data.status === 'waiting_for_agent') { |
| 760 | - removeThinkingDots(botId); | |
| 761 | - updateChatModeIndicator('agent', botId); | |
| 762 | - enableChatInput(botId); | |
| 358 | + updateChatModeIndicator('agent'); | |
| 763 | 359 | return; |
| 764 | 360 | } |
| 765 | 361 | |
| 362 | + // Handle other responses | |
| 363 | + let responseText = response.text || ''; | |
| 364 | + let responseHtml = response.html || ''; | |
| 365 | + let responseMessage = response.message || ''; | |
| 366 | + | |
| 367 | + if (responseText === 'You are now chatting with the AI chatbot.') { | |
| 368 | + updateChatModeIndicator('ai'); | |
| 369 | + } | |
| 370 | + | |
| 766 | 371 | // Handle the message and show notification if chat is hidden |
| 767 | 372 | if (responseText || responseHtml || responseMessage) { |
| 768 | - | |
| 373 | + | |
| 769 | 374 | // ADD RESPONSE HOOKS HERE - BEFORE DISPLAYING |
| 770 | 375 | if (responseText && typeof customMxChatFilter === 'function') { |
| 771 | 376 | responseText = customMxChatFilter(responseText, "response"); |
| 772 | 377 | } |
| @@ -772,53 +377,89 @@ | ||
| 772 | 377 | } |
| 773 | 378 | if (responseMessage && typeof customMxChatFilter === 'function') { |
| 774 | 379 | responseMessage = customMxChatFilter(responseMessage, "response"); |
| 775 | 380 | } |
| 776 | - | |
| 381 | + | |
| 777 | 382 | // Update the messages as before |
| 778 | 383 | if (responseText && responseHtml) { |
| 779 | - replaceLastMessage("bot", responseText, responseHtml, [], botId); | |
| 384 | + replaceLastMessage("bot", responseText, responseHtml); | |
| 780 | 385 | } else if (responseText) { |
| 781 | - replaceLastMessage("bot", responseText, '', [], botId); | |
| 386 | + replaceLastMessage("bot", responseText); | |
| 782 | 387 | } else if (responseHtml) { |
| 783 | - replaceLastMessage("bot", "", responseHtml, [], botId); | |
| 388 | + replaceLastMessage("bot", "", responseHtml); | |
| 784 | 389 | } else if (responseMessage) { |
| 785 | - replaceLastMessage("bot", responseMessage, '', [], botId); | |
| 390 | + replaceLastMessage("bot", responseMessage); | |
| 786 | 391 | } |
| 787 | 392 | |
| 788 | 393 | // Check if chat is hidden and show notification |
| 789 | - var $floatingChatbot = getElement(botId, 'floating-chatbot'); | |
| 790 | - if ($floatingChatbot.hasClass('hidden')) { | |
| 791 | - var $badge = getElement(botId, 'chat-notification-badge'); | |
| 792 | - if ($badge.length) { | |
| 793 | - $badge.show(); | |
| 394 | + if ($('#floating-chatbot').hasClass('hidden')) { | |
| 395 | + const badge = $('#chat-notification-badge'); | |
| 396 | + if (badge.length) { | |
| 397 | + badge.show(); | |
| 794 | 398 | } |
| 795 | 399 | } |
| 796 | 400 | } else { |
| 797 | - var emptyMsg = "I received an empty response. Please try again or contact support if this persists."; | |
| 798 | - if (response.vectorstore_error) { | |
| 799 | - emptyMsg = "I received an empty response. Debug info: " + response.vectorstore_error; | |
| 800 | - } | |
| 801 | - replaceLastMessage("bot", emptyMsg, '', [], botId); | |
| 401 | + ////console.error("Unexpected response format:", response); | |
| 402 | + replaceLastMessage("bot", "I received an empty response. Please try again or contact support if this persists."); | |
| 802 | 403 | } |
| 803 | 404 | |
| 804 | 405 | if (response.message_id) { |
| 805 | - var instance = MxChatInstances.get(botId); | |
| 806 | - instance.lastSeenMessageId = response.message_id; | |
| 406 | + lastSeenMessageId = response.message_id; | |
| 807 | 407 | } |
| 808 | 408 | |
| 809 | 409 | return; |
| 810 | 410 | } |
| 811 | 411 | |
| 812 | - // Fallback for truly unexpected response formats | |
| 813 | - replaceLastMessage("bot", "Unexpected response format. Please try again or contact support.", '', [], botId); | |
| 412 | + // If we got here, it's likely an error response | |
| 413 | + // Now we can check for error conditions with our robust error handling | |
| 414 | + | |
| 415 | + let errorMessage = ""; | |
| 416 | + let errorCode = ""; | |
| 417 | + | |
| 418 | + // Check various possible error locations in the response | |
| 419 | + if (response.data && response.data.error_message) { | |
| 420 | + errorMessage = response.data.error_message; | |
| 421 | + errorCode = response.data.error_code || ""; | |
| 422 | + } else if (response.error_message) { | |
| 423 | + errorMessage = response.error_message; | |
| 424 | + errorCode = response.error_code || ""; | |
| 425 | + } else if (response.message) { | |
| 426 | + errorMessage = response.message; | |
| 427 | + } else if (typeof response.data === 'string') { | |
| 428 | + errorMessage = response.data; | |
| 429 | + } else if (!response.success) { | |
| 430 | + // Explicit check for success: false without other error info | |
| 431 | + errorMessage = "An error occurred. Please try again or contact support."; | |
| 432 | + } else { | |
| 433 | + // Fallback for any other unexpected response format | |
| 434 | + errorMessage = "Unexpected response received. Please try again or contact support."; | |
| 435 | + } | |
| 436 | + | |
| 437 | + // Log the error with code for debugging | |
| 438 | + //console.log("Response data:", response.data); | |
| 439 | + ////console.error("API Error:", errorMessage, "Code:", errorCode); | |
| 440 | + | |
| 441 | + // Format user-friendly error message | |
| 442 | + let displayMessage = errorMessage; | |
| 443 | + | |
| 444 | + // Customize message for admin users | |
| 445 | + if (mxchatChat.is_admin) { | |
| 446 | + // For admin users, show more technical details including error code | |
| 447 | + displayMessage = errorMessage + (errorCode ? " (Error code: " + errorCode + ")" : ""); | |
| 448 | + } | |
| 449 | + | |
| 450 | + replaceLastMessage("bot", displayMessage); | |
| 814 | 451 | }, |
| 815 | 452 | error: function(xhr, status, error) { |
| 453 | + //console.error("AJAX Error:", status, error); | |
| 454 | + //console.log("Response Text:", xhr.responseText); | |
| 455 | + | |
| 816 | 456 | let errorMessage = "An unexpected error occurred."; |
| 817 | 457 | |
| 818 | 458 | // Try to parse the response if it's JSON |
| 819 | 459 | try { |
| 820 | 460 | const responseJson = JSON.parse(xhr.responseText); |
| 461 | + //console.log("Parsed error response:", responseJson); | |
| 821 | 462 | |
| 822 | 463 | if (responseJson.data && responseJson.data.error_message) { |
| 823 | 464 | errorMessage = responseJson.data.error_message; |
| 824 | 465 | } else if (responseJson.message) { |
| @@ -838,22 +479,21 @@ | ||
| 838 | 479 | errorMessage = "Server error: The server encountered an issue. Please try again later."; |
| 839 | 480 | } |
| 840 | 481 | } |
| 841 | 482 | |
| 842 | - replaceLastMessage("bot", errorMessage, '', [], botId); | |
| 483 | + replaceLastMessage("bot", errorMessage); | |
| 843 | 484 | } |
| 844 | 485 | }); |
| 845 | 486 | } |
| 846 | 487 | |
| 847 | -function callMxChatStream(message, callback, botId) { | |
| 848 | - botId = botId || getMxChatBotId(); | |
| 849 | - | |
| 850 | - // Store the message in case we need to retry after session reset | |
| 851 | - getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', message); | |
| 852 | - | |
| 853 | - const currentModel = mxchatChat.model || 'gpt-5.1-chat-latest'; | |
| 488 | + | |
| 489 | +function callMxChatStream(message, callback) { | |
| 490 | + console.log("Using streaming for message:", message); | |
| 491 | + | |
| 492 | + const currentModel = mxchatChat.model || 'gpt-4o'; | |
| 854 | 493 | if (!isStreamingSupported(currentModel)) { |
| 855 | - callMxChat(message, callback, botId); | |
| 494 | + console.log("Streaming not supported, falling back to regular call"); | |
| 495 | + callMxChat(message, callback); | |
| 856 | 496 | return; |
| 857 | 497 | } |
| 858 | 498 | |
| 859 | 499 | // Get page context if contextual awareness is enabled |
| @@ -858,32 +498,16 @@ | ||
| 858 | 498 | |
| 859 | 499 | // Get page context if contextual awareness is enabled |
| 860 | 500 | const pageContext = getPageContext(); |
| 861 | 501 | |
| 862 | - // Get instance for session start timestamp (used when persistence is OFF) | |
| 863 | - var instance = MxChatInstances.get(botId); | |
| 864 | - | |
| 865 | - // Guarantee a non-null session_id before the fetch. FormData.append() stringifies any | |
| 866 | - // non-string value via String(), so passing `null` would POST the literal string "null" | |
| 867 | - // and land in the transcripts table as a ghost session. ensureSession() always returns | |
| 868 | - // a real string even when cookies/localStorage are blocked. | |
| 869 | - var streamSessionId = MxChatInstances.ensureSession(botId); | |
| 870 | - if (!streamSessionId || streamSessionId === 'null' || streamSessionId === 'undefined') { | |
| 871 | - streamSessionId = generateSessionId(); | |
| 872 | - MxChatInstances.setChatSession(botId, streamSessionId); | |
| 873 | - } | |
| 874 | - | |
| 875 | 502 | const formData = new FormData(); |
| 876 | 503 | formData.append('action', 'mxchat_stream_chat'); |
| 877 | 504 | formData.append('message', message); |
| 878 | - formData.append('session_id', streamSessionId); | |
| 505 | + formData.append('session_id', getChatSession()); | |
| 879 | 506 | formData.append('nonce', mxchatChat.nonce); |
| 880 | 507 | formData.append('current_page_url', window.location.href); |
| 881 | 508 | formData.append('current_page_title', document.title); |
| 882 | - formData.append('bot_id', botId); | |
| 883 | - // Pass session start timestamp so AI context matches what user sees | |
| 884 | - formData.append('session_start_timestamp', instance.sessionStartTimestamp || 0); | |
| 885 | - | |
| 509 | + | |
| 886 | 510 | // Add page context if available |
| 887 | 511 | if (pageContext) { |
| 888 | 512 | formData.append('page_context', JSON.stringify(pageContext)); |
| 889 | 513 | } |
| @@ -908,14 +532,17 @@ | ||
| 908 | 532 | body: formData, |
| 909 | 533 | credentials: 'same-origin' |
| 910 | 534 | }) |
| 911 | 535 | .then(response => { |
| 536 | + console.log("Streaming response received:", response); | |
| 537 | + | |
| 912 | 538 | // Store the response for potential fallback handling |
| 913 | 539 | const responseClone = response.clone(); |
| 914 | - | |
| 540 | + | |
| 915 | 541 | if (!response.ok) { |
| 916 | 542 | // Try to get error details from response |
| 917 | 543 | return responseClone.json().then(errorData => { |
| 544 | + console.log("Server returned error response:", errorData); | |
| 918 | 545 | throw { isServerError: true, data: errorData }; |
| 919 | 546 | }).catch(() => { |
| 920 | 547 | throw new Error('Network response was not ok'); |
| 921 | 548 | }); |
| @@ -920,28 +547,27 @@ | ||
| 920 | 547 | throw new Error('Network response was not ok'); |
| 921 | 548 | }); |
| 922 | 549 | } |
| 923 | 550 | |
| 924 | - // Check if response is JSON instead of streaming | |
| 925 | - const contentType = response.headers.get('content-type'); | |
| 926 | - if (contentType && contentType.includes('application/json')) { | |
| 927 | - return responseClone.json().then(data => { | |
| 928 | - // IMMEDIATE CHAT MODE UPDATE for JSON response | |
| 929 | - if (data.chat_mode) { | |
| 930 | - updateChatModeIndicator(data.chat_mode, botId); | |
| 931 | - } | |
| 551 | + // Check if response is JSON instead of streaming | |
| 552 | + const contentType = response.headers.get('content-type'); | |
| 553 | + if (contentType && contentType.includes('application/json')) { | |
| 554 | + console.log("Received JSON response instead of stream"); | |
| 555 | + return responseClone.json().then(data => { | |
| 556 | + console.log("Processing JSON response:", data); | |
| 932 | 557 | |
| 933 | - // Check for testing panel | |
| 934 | - if (window.mxchatTestPanelInstance && data.testing_data) { | |
| 935 | - window.mxchatTestPanelInstance.handleTestingData(data.testing_data); | |
| 936 | - } | |
| 558 | + // Check for testing panel | |
| 559 | + if (window.mxchatTestPanelInstance && data.testing_data) { | |
| 560 | + console.log('Testing data found in streaming JSON response:', data.testing_data); | |
| 561 | + window.mxchatTestPanelInstance.handleTestingData(data.testing_data); | |
| 562 | + } | |
| 563 | + | |
| 564 | + // Handle the JSON response directly - no need for another call | |
| 565 | + handleNonStreamResponse(data, callback); | |
| 566 | + return Promise.resolve(); // Prevent further processing | |
| 567 | + }); | |
| 568 | + } | |
| 937 | 569 | |
| 938 | - // Handle the JSON response directly | |
| 939 | - handleNonStreamResponse(data, callback, botId); | |
| 940 | - return Promise.resolve(); // Prevent further processing | |
| 941 | - }); | |
| 942 | - } | |
| 943 | - | |
| 944 | 570 | // Continue with streaming processing |
| 945 | 571 | const reader = response.body.getReader(); |
| 946 | 572 | const decoder = new TextDecoder(); |
| 947 | 573 | let buffer = ''; |
| @@ -948,44 +574,37 @@ | ||
| 948 | 574 | |
| 949 | 575 | function processStream() { |
| 950 | 576 | reader.read().then(({ done, value }) => { |
| 951 | 577 | if (done) { |
| 578 | + console.log("Streaming completed, final content:", accumulatedContent); | |
| 579 | + | |
| 952 | 580 | // If streaming completed but no content was received, try to get response as fallback |
| 953 | 581 | if (!streamingStarted || !accumulatedContent) { |
| 582 | + console.log("Stream completed with no content, checking for fallback data"); | |
| 583 | + | |
| 954 | 584 | // Try to read the response as JSON |
| 955 | 585 | responseClone.text().then(text => { |
| 956 | 586 | try { |
| 957 | 587 | const data = JSON.parse(text); |
| 958 | - if (data.text || data.message || data.html) { | |
| 959 | - handleNonStreamResponse(data, callback, botId); | |
| 588 | + if (data.text || data.message) { | |
| 589 | + handleNonStreamResponse(data, callback); | |
| 960 | 590 | } else { |
| 961 | 591 | // No valid data, fall back to regular call |
| 962 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 963 | - callMxChat(message, callback, botId); | |
| 592 | + $('.bot-message.temporary-message').remove(); | |
| 593 | + callMxChat(message, callback); | |
| 964 | 594 | } |
| 965 | 595 | } catch (e) { |
| 966 | 596 | // Could not parse, fall back to regular call |
| 967 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 968 | - callMxChat(message, callback, botId); | |
| 597 | + $('.bot-message.temporary-message').remove(); | |
| 598 | + callMxChat(message, callback); | |
| 969 | 599 | } |
| 970 | 600 | }).catch(() => { |
| 971 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 972 | - callMxChat(message, callback, botId); | |
| 601 | + $('.bot-message.temporary-message').remove(); | |
| 602 | + callMxChat(message, callback); | |
| 973 | 603 | }); |
| 974 | 604 | return; |
| 975 | 605 | } |
| 976 | - | |
| 977 | - // Re-enable chat input when stream ends with content | |
| 978 | - enableChatInput(botId); | |
| 979 | - | |
| 980 | - // Scroll the user's last message to the top now that the | |
| 981 | - // bot's full reply has rendered (gives max reading room). | |
| 982 | - var $chatBoxDone = getElement(botId, 'chat-box'); | |
| 983 | - var $lastUserMsgDone = $chatBoxDone.find('.user-message').last(); | |
| 984 | - if ($lastUserMsgDone.length) { | |
| 985 | - scrollElementToTop($lastUserMsgDone, botId); | |
| 986 | - } | |
| 987 | - | |
| 606 | + | |
| 988 | 607 | if (callback) { |
| 989 | 608 | callback(accumulatedContent); |
| 990 | 609 | } |
| 991 | 610 | return; |
| @@ -999,25 +618,17 @@ | ||
| 999 | 618 | if (line.startsWith('data: ')) { |
| 1000 | 619 | const data = line.substring(6); |
| 1001 | 620 | |
| 1002 | 621 | if (data === '[DONE]') { |
| 622 | + console.log("Received [DONE] signal"); | |
| 623 | + | |
| 1003 | 624 | if (!accumulatedContent) { |
| 1004 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 1005 | - callMxChat(message, callback, botId); | |
| 625 | + console.log("No content received before [DONE]"); | |
| 626 | + $('.bot-message.temporary-message').remove(); | |
| 627 | + callMxChat(message, callback); | |
| 1006 | 628 | return; |
| 1007 | 629 | } |
| 1008 | - | |
| 1009 | - // Re-enable chat input after streaming completes | |
| 1010 | - enableChatInput(botId); | |
| 1011 | - | |
| 1012 | - // Scroll the user's last message to the top now | |
| 1013 | - // that the bot's full reply has rendered. | |
| 1014 | - var $chatBoxStreamDone = getElement(botId, 'chat-box'); | |
| 1015 | - var $lastUserMsgStreamDone = $chatBoxStreamDone.find('.user-message').last(); | |
| 1016 | - if ($lastUserMsgStreamDone.length) { | |
| 1017 | - scrollElementToTop($lastUserMsgStreamDone, botId); | |
| 1018 | - } | |
| 1019 | - | |
| 630 | + | |
| 1020 | 631 | if (callback) { |
| 1021 | 632 | callback(accumulatedContent); |
| 1022 | 633 | } |
| 1023 | 634 | return; |
| @@ -1024,16 +635,12 @@ | ||
| 1024 | 635 | } |
| 1025 | 636 | |
| 1026 | 637 | try { |
| 1027 | 638 | const json = JSON.parse(data); |
| 1028 | - | |
| 1029 | - // IMMEDIATE CHAT MODE UPDATE FOR STREAMING | |
| 1030 | - if (json.chat_mode) { | |
| 1031 | - updateChatModeIndicator(json.chat_mode, botId); | |
| 1032 | - } | |
| 1033 | - | |
| 639 | + | |
| 1034 | 640 | // Handle testing data |
| 1035 | 641 | if (json.testing_data && !testingDataReceived) { |
| 642 | + console.log('Testing data received in stream:', json.testing_data); | |
| 1036 | 643 | if (window.mxchatTestPanelInstance) { |
| 1037 | 644 | window.mxchatTestPanelInstance.handleTestingData(json.testing_data); |
| 1038 | 645 | testingDataReceived = true; |
| 1039 | 646 | } |
| @@ -1041,35 +648,31 @@ | ||
| 1041 | 648 | // Handle content streaming |
| 1042 | 649 | else if (json.content) { |
| 1043 | 650 | streamingStarted = true; |
| 1044 | 651 | accumulatedContent += json.content; |
| 1045 | - updateStreamingMessage(accumulatedContent, botId); | |
| 1046 | - } | |
| 652 | + updateStreamingMessage(accumulatedContent); | |
| 653 | + } | |
| 1047 | 654 | // Handle complete response in stream (fallback response) |
| 1048 | - else if (json.text || json.message || json.html) { | |
| 1049 | - handleNonStreamResponse(json, callback, botId); | |
| 655 | + else if (json.text || json.message) { | |
| 656 | + console.log("Received complete response in stream:", json); | |
| 657 | + handleNonStreamResponse(json, callback); | |
| 1050 | 658 | return; |
| 1051 | 659 | } |
| 1052 | 660 | // Handle errors |
| 1053 | 661 | else if (json.error) { |
| 1054 | - | |
| 1055 | - // Get error message from various possible fields | |
| 1056 | - let errorMessage = json.error_message || json.message || json.text || | |
| 1057 | - (typeof json.error === 'string' ? json.error : 'An error occurred. Please try again.'); | |
| 1058 | - | |
| 1059 | - // Re-enable chat input on error | |
| 1060 | - enableChatInput(botId); | |
| 1061 | - | |
| 1062 | - // Display the error directly in the chat | |
| 1063 | - replaceLastMessage("bot", errorMessage, '', [], botId); | |
| 1064 | - | |
| 1065 | - if (callback) { | |
| 1066 | - callback(errorMessage); | |
| 662 | + console.error("Streaming error:", json.error); | |
| 663 | + | |
| 664 | + // Check if we have a fallback response | |
| 665 | + if (json.fallback || json.text || json.message) { | |
| 666 | + handleNonStreamResponse(json, callback); | |
| 667 | + } else { | |
| 668 | + $('.bot-message.temporary-message').remove(); | |
| 669 | + callMxChat(message, callback); | |
| 1067 | 670 | } |
| 1068 | 671 | return; |
| 1069 | 672 | } |
| 1070 | 673 | } catch (e) { |
| 1071 | - // SSE data parsing error - silently continue | |
| 674 | + console.error('Error parsing SSE data:', e, 'Data:', data); | |
| 1072 | 675 | } |
| 1073 | 676 | } |
| 1074 | 677 | } |
| 1075 | 678 | |
| @@ -1074,118 +677,42 @@ | ||
| 1074 | 677 | } |
| 1075 | 678 | |
| 1076 | 679 | processStream(); |
| 1077 | 680 | }).catch(streamError => { |
| 1078 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 1079 | - callMxChat(message, callback, botId); | |
| 681 | + console.error('Error reading stream:', streamError); | |
| 682 | + $('.bot-message.temporary-message').remove(); | |
| 683 | + callMxChat(message, callback); | |
| 1080 | 684 | }); |
| 1081 | 685 | } |
| 1082 | 686 | |
| 1083 | 687 | processStream(); |
| 1084 | 688 | }) |
| 1085 | - .catch(error => { | |
| 1086 | - // Check if we have server error data with chat mode | |
| 1087 | - if (error && error.isServerError && error.data) { | |
| 1088 | - // Check for chat mode in error data | |
| 1089 | - if (error.data.chat_mode) { | |
| 1090 | - updateChatModeIndicator(error.data.chat_mode, botId); | |
| 1091 | - } | |
| 1092 | - | |
| 1093 | - handleNonStreamResponse(error.data, callback, botId); | |
| 1094 | - } else { | |
| 1095 | - // Only fall back to regular call if we don't have any response data | |
| 1096 | - getElement(botId, 'chat-box').find('.bot-message.temporary-message').remove(); | |
| 1097 | - callMxChat(message, callback, botId); | |
| 1098 | - } | |
| 1099 | - }); | |
| 689 | + .catch(error => { | |
| 690 | + console.log('Streaming failed:', error); | |
| 691 | + | |
| 692 | + // Check if we have server error data | |
| 693 | + if (error && error.isServerError && error.data) { | |
| 694 | + console.log('Using server error response data'); | |
| 695 | + handleNonStreamResponse(error.data, callback); | |
| 696 | + } else { | |
| 697 | + // Only fall back to regular call if we don't have any response data | |
| 698 | + console.log('No response data available, falling back to regular call'); | |
| 699 | + $('.bot-message.temporary-message').remove(); | |
| 700 | + callMxChat(message, callback); | |
| 701 | + } | |
| 702 | + }); | |
| 1100 | 703 | } |
| 1101 | 704 | |
| 1102 | 705 | // Helper function to handle non-streaming responses |
| 1103 | -function handleNonStreamResponse(data, callback, botId) { | |
| 1104 | - botId = botId || 'default'; | |
| 1105 | - | |
| 1106 | - // IMMEDIATE CHAT MODE UPDATE FOR NON-STREAMING RESPONSES | |
| 1107 | - if (data.chat_mode) { | |
| 1108 | - updateChatModeIndicator(data.chat_mode, botId); | |
| 1109 | - } | |
| 1110 | - | |
| 1111 | - // Also check in data property if response is wrapped | |
| 1112 | - if (data.data && data.data.chat_mode) { | |
| 1113 | - updateChatModeIndicator(data.data.chat_mode, botId); | |
| 1114 | - } | |
| 1115 | - | |
| 1116 | - // NOTE: Don't remove temporary message here - let replaceLastMessage handle it | |
| 1117 | - // This prevents a visual gap between thinking dots disappearing and content appearing | |
| 1118 | - | |
| 1119 | - // SECURITY FIX: Check for errors FIRST | |
| 1120 | - if (data.success === false || (data.data && data.data.error_message)) { | |
| 1121 | - let errorMessage = ""; | |
| 1122 | - let errorCode = ""; | |
| 1123 | - | |
| 1124 | - // Check various possible error locations | |
| 1125 | - if (data.data && data.data.error_message) { | |
| 1126 | - errorMessage = data.data.error_message; | |
| 1127 | - errorCode = data.data.error_code || ""; | |
| 1128 | - } else if (data.error_message) { | |
| 1129 | - errorMessage = data.error_message; | |
| 1130 | - errorCode = data.error_code || ""; | |
| 1131 | - } else if (data.message) { | |
| 1132 | - errorMessage = data.message; | |
| 1133 | - } else if (typeof data.data === 'string') { | |
| 1134 | - errorMessage = data.data; | |
| 1135 | - } else { | |
| 1136 | - errorMessage = "An error occurred. Please try again or contact support."; | |
| 1137 | - } | |
| 1138 | - | |
| 1139 | - // Handle session reset action (IP changed, session expired, etc.) | |
| 1140 | - // Silent reset — keep chat UI intact, just get a new session and retry | |
| 1141 | - if (data.data && data.data.action === 'reset_session') { | |
| 1142 | - MxChatInstances.silentResetSession(botId); | |
| 1143 | - // Re-send the original message with the new session (user message is already displayed) | |
| 1144 | - var originalMessage = getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message'); | |
| 1145 | - if (originalMessage) { | |
| 1146 | - getElement(botId, 'mxchat-chatbot-wrapper').find('.mxchat-input-holder textarea').data('pending-message', null); | |
| 1147 | - var currentModel = mxchatChat.model || 'gpt-5.1-chat-latest'; | |
| 1148 | - if (shouldUseStreaming(currentModel)) { | |
| 1149 | - callMxChatStream(originalMessage, callback, botId); | |
| 1150 | - } else { | |
| 1151 | - callMxChat(originalMessage, callback, botId); | |
| 1152 | - } | |
| 1153 | - } | |
| 1154 | - return; | |
| 1155 | - } | |
| 1156 | - | |
| 1157 | - // Format user-friendly error message | |
| 1158 | - let displayMessage = errorMessage; | |
| 1159 | - if (mxchatChat.is_admin) { | |
| 1160 | - displayMessage = errorMessage + (errorCode ? " (Error code: " + errorCode + ")" : ""); | |
| 1161 | - } | |
| 1162 | - | |
| 1163 | - replaceLastMessage("bot", displayMessage, '', [], botId); | |
| 1164 | - | |
| 1165 | - if (callback) { | |
| 1166 | - callback(''); | |
| 1167 | - } | |
| 1168 | - return; // Exit early for errors | |
| 1169 | - } | |
| 1170 | - | |
| 1171 | - // Check for live agent response | |
| 1172 | - if (data.success && data.data && data.data.status === 'waiting_for_agent') { | |
| 1173 | - removeThinkingDots(botId); | |
| 1174 | - // Also remove any leftover bot-message that lost its temporary-message class | |
| 1175 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1176 | - $chatBox.find('.bot-message .thinking-dots').closest('.bot-message').remove(); | |
| 1177 | - updateChatModeIndicator('agent', botId); | |
| 1178 | - enableChatInput(botId); | |
| 1179 | - if (callback) { | |
| 1180 | - callback(''); | |
| 1181 | - } | |
| 1182 | - return; | |
| 1183 | - } | |
| 1184 | - | |
| 706 | +function handleNonStreamResponse(data, callback) { | |
| 707 | + console.log("Handling non-stream response:", data); | |
| 708 | + | |
| 709 | + // Remove temporary message | |
| 710 | + $('.bot-message.temporary-message').remove(); | |
| 711 | + | |
| 1185 | 712 | // Handle different response formats |
| 1186 | 713 | if (data.text || data.html || data.message) { |
| 1187 | - | |
| 714 | + | |
| 1188 | 715 | // Apply response hooks |
| 1189 | 716 | if (data.text && typeof customMxChatFilter === 'function') { |
| 1190 | 717 | data.text = customMxChatFilter(data.text, "response"); |
| 1191 | 718 | } |
| @@ -1191,384 +718,97 @@ | ||
| 1191 | 718 | } |
| 1192 | 719 | if (data.message && typeof customMxChatFilter === 'function') { |
| 1193 | 720 | data.message = customMxChatFilter(data.message, "response"); |
| 1194 | 721 | } |
| 1195 | - | |
| 722 | + | |
| 1196 | 723 | // Display the response |
| 1197 | 724 | if (data.text && data.html) { |
| 1198 | - replaceLastMessage("bot", data.text, data.html, [], botId); | |
| 725 | + replaceLastMessage("bot", data.text, data.html); | |
| 1199 | 726 | } else if (data.text) { |
| 1200 | - replaceLastMessage("bot", data.text, '', [], botId); | |
| 727 | + replaceLastMessage("bot", data.text); | |
| 1201 | 728 | } else if (data.html) { |
| 1202 | - replaceLastMessage("bot", "", data.html, [], botId); | |
| 729 | + replaceLastMessage("bot", "", data.html); | |
| 1203 | 730 | } else if (data.message) { |
| 1204 | - replaceLastMessage("bot", data.message, '', [], botId); | |
| 731 | + replaceLastMessage("bot", data.message); | |
| 1205 | 732 | } |
| 1206 | 733 | } |
| 1207 | - | |
| 734 | + | |
| 1208 | 735 | // Handle other response properties |
| 736 | + if (data.chat_mode) { | |
| 737 | + updateChatModeIndicator(data.chat_mode); | |
| 738 | + } | |
| 739 | + | |
| 1209 | 740 | if (data.data && data.data.filename) { |
| 1210 | - showActivePdf(data.data.filename, botId); | |
| 1211 | - var instance = MxChatInstances.get(botId); | |
| 1212 | - instance.activePdfFile = data.data.filename; | |
| 741 | + showActivePdf(data.data.filename); | |
| 742 | + activePdfFile = data.data.filename; | |
| 1213 | 743 | } |
| 1214 | - | |
| 744 | + | |
| 1215 | 745 | if (data.redirect_url) { |
| 1216 | 746 | setTimeout(() => { |
| 1217 | 747 | window.location.href = data.redirect_url; |
| 1218 | 748 | }, 1500); |
| 1219 | 749 | } |
| 1220 | - | |
| 1221 | - // Ensure chat input is re-enabled (safety net for edge cases) | |
| 1222 | - enableChatInput(botId); | |
| 1223 | - | |
| 750 | + | |
| 1224 | 751 | if (callback) { |
| 1225 | 752 | callback(data.text || data.message || ''); |
| 1226 | 753 | } |
| 1227 | 754 | } |
| 1228 | 755 | |
| 1229 | -// Enhanced updateChatModeIndicator function for immediate DOM updates | |
| 1230 | -function updateChatModeIndicator(mode, botId) { | |
| 1231 | - botId = botId || 'default'; | |
| 1232 | - const indicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 1233 | - if (indicator) { | |
| 1234 | - const oldText = indicator.textContent; | |
| 1235 | - | |
| 1236 | - if (mode === 'agent') { | |
| 1237 | - indicator.textContent = 'Live Agent'; | |
| 1238 | - startPolling(botId); | |
| 1239 | - } else { | |
| 1240 | - // Everything else is AI mode | |
| 1241 | - const customAiText = indicator.getAttribute('data-ai-text') || 'AI Agent'; | |
| 1242 | - indicator.textContent = customAiText; | |
| 1243 | - stopPolling(botId); | |
| 1244 | - } | |
| 1245 | - | |
| 1246 | - // Force immediate DOM update and reflow | |
| 1247 | - if (oldText !== indicator.textContent) { | |
| 1248 | - // Force a reflow to ensure the change is visible immediately | |
| 1249 | - indicator.style.display = 'none'; | |
| 1250 | - indicator.offsetHeight; // Trigger reflow | |
| 1251 | - indicator.style.display = ''; | |
| 1252 | - | |
| 1253 | - // Double-check after a brief moment to ensure the change stuck | |
| 1254 | - setTimeout(() => { | |
| 1255 | - if (mode === 'agent' && indicator.textContent !== 'Live Agent') { | |
| 1256 | - indicator.textContent = 'Live Agent'; | |
| 1257 | - } else if (mode !== 'agent' && indicator.textContent === 'Live Agent') { | |
| 1258 | - const customAiText = indicator.getAttribute('data-ai-text') || 'AI Agent'; | |
| 1259 | - indicator.textContent = customAiText; | |
| 1260 | - } | |
| 1261 | - }, 50); | |
| 1262 | - } | |
| 1263 | - } | |
| 1264 | -} | |
| 1265 | - | |
| 1266 | 756 | // Function to update message during streaming |
| 1267 | -function updateStreamingMessage(content, botId) { | |
| 1268 | - botId = botId || 'default'; | |
| 1269 | - | |
| 757 | +function updateStreamingMessage(content) { | |
| 1270 | 758 | // ADD RESPONSE HOOK FOR REAL-TIME STREAMING |
| 1271 | 759 | if (typeof customMxChatFilter === 'function') { |
| 1272 | 760 | content = customMxChatFilter(content, "response"); |
| 1273 | 761 | } |
| 762 | + | |
| 763 | + const formattedContent = linkify(formatBoldText(convertNewlinesToBreaks(formatCodeBlocks(content)))); | |
| 1274 | 764 | |
| 1275 | - const formattedContent = linkify(content); | |
| 765 | + // Find the temporary message | |
| 766 | + const tempMessage = $('.bot-message.temporary-message').last(); | |
| 1276 | 767 | |
| 1277 | - // Find the temporary message in this bot's chat box | |
| 1278 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1279 | - const tempMessage = $chatBox.find('.bot-message.temporary-message').last(); | |
| 1280 | - | |
| 1281 | 768 | if (tempMessage.length) { |
| 1282 | 769 | // Update existing message |
| 1283 | 770 | tempMessage.html(formattedContent); |
| 1284 | 771 | } else { |
| 1285 | 772 | // Create new temporary message if it doesn't exist |
| 1286 | - appendMessage("bot", content, '', [], true, botId); | |
| 773 | + appendMessage("bot", content, '', [], true); | |
| 1287 | 774 | } |
| 1288 | 775 | } |
| 1289 | 776 | |
| 777 | +// UPGRADE: Function to check if streaming is supported for the current model | |
| 1290 | 778 | function isStreamingSupported(model) { |
| 1291 | 779 | if (!model) return false; |
| 1292 | 780 | |
| 781 | + //console.log("Checking streaming support for model:", model); // Debug log | |
| 782 | + | |
| 783 | + // Get the model prefix | |
| 1293 | 784 | const modelPrefix = model.split('-')[0].toLowerCase(); |
| 785 | + | |
| 786 | + //console.log("Model prefix:", modelPrefix); // Debug log | |
| 1294 | 787 | |
| 1295 | - // Support streaming for OpenAI, Claude, Grok, DeepSeek, and OpenRouter models | |
| 1296 | - const isSupported = modelPrefix === 'gpt' || | |
| 1297 | - modelPrefix === 'o1' || | |
| 1298 | - modelPrefix === 'claude' || | |
| 1299 | - modelPrefix === 'grok' || | |
| 1300 | - modelPrefix === 'deepseek' || | |
| 1301 | - model === 'openrouter'; // Add this line - check full model name for OpenRouter | |
| 788 | + // Support streaming for OpenAI, Claude, and Grok models | |
| 789 | + const isSupported = modelPrefix === 'gpt' || modelPrefix === 'o1' || modelPrefix === 'claude' || modelPrefix === 'grok'; | |
| 1302 | 790 | |
| 791 | + //console.log("Streaming supported:", isSupported); // Debug log | |
| 792 | + | |
| 1303 | 793 | return isSupported; |
| 1304 | 794 | } |
| 1305 | 795 | |
| 1306 | -// Update the event handlers to use the correct function names (using event delegation) | |
| 1307 | -// Use class-based selectors for multi-instance support | |
| 1308 | -$(document).on('click', '.send-button', function() { | |
| 1309 | - var botId = getBotIdFromElement(this); | |
| 1310 | - var modeIndicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 1311 | - if (!(modeIndicator && modeIndicator.textContent === 'Live Agent')) { | |
| 1312 | - disableChatInput(botId); | |
| 1313 | - } | |
| 1314 | - sendMessage(botId); | |
| 796 | +// Update the event handlers to use the correct function names | |
| 797 | +$('#send-button').off('click').on('click', function() { | |
| 798 | + sendMessage(); // Use the updated sendMessage function | |
| 1315 | 799 | }); |
| 1316 | 800 | |
| 1317 | -// Override enter key handler (using event delegation) | |
| 1318 | -$(document).on('keypress', '.chat-input', function(e) { | |
| 801 | +// Override enter key handler | |
| 802 | +$('#chat-input').off('keypress').on('keypress', function(e) { | |
| 1319 | 803 | if (e.which == 13 && !e.shiftKey) { |
| 1320 | 804 | e.preventDefault(); |
| 1321 | - var botId = getBotIdFromElement(this); | |
| 1322 | - var modeIndicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 1323 | - if (!(modeIndicator && modeIndicator.textContent === 'Live Agent')) { | |
| 1324 | - disableChatInput(botId); | |
| 1325 | - } | |
| 1326 | - sendMessage(botId); | |
| 805 | + sendMessage(); // Use the updated sendMessage function | |
| 1327 | 806 | } |
| 1328 | 807 | }); |
| 1329 | 808 | |
| 1330 | 809 | |
| 1331 | -// Tags the chat-box transcript so the print stylesheet can target it, | |
| 1332 | -// and lazily initializes the header overflow menu for this bot if the | |
| 1333 | -// markup is present but not yet wired (covers dynamically-rendered widgets). | |
| 1334 | -// Idempotent; safe to call on every appended message. | |
| 1335 | -function mxchatEnsurePrintRoot(botId) { | |
| 1336 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1337 | - if (!$chatBox || !$chatBox.length) return; | |
| 1338 | - $chatBox.addClass('mxchat-conversation-print-root'); | |
| 1339 | - if (!$chatBox.attr('data-print-title')) { | |
| 1340 | - var nowStr = new Date().toLocaleString(); | |
| 1341 | - var headerTitle = ((typeof mxchatChat !== 'undefined' && mxchatChat.print_header_title) || 'Chat transcript') + ' — ' + nowStr; | |
| 1342 | - $chatBox.attr('data-print-title', headerTitle); | |
| 1343 | - } | |
| 1344 | - if (typeof mxchatInitHeaderMenu === 'function') { | |
| 1345 | - mxchatInitHeaderMenu(botId); | |
| 1346 | - } | |
| 1347 | -} | |
| 1348 | - | |
| 1349 | -// Builds the list of overflow-menu items for a given bot. | |
| 1350 | -// Adding a future item is one push to this array — do NOT hardcode "only download." | |
| 1351 | -function mxchatGetHeaderMenuItems(botId) { | |
| 1352 | - var items = []; | |
| 1353 | - var settings = (typeof mxchatChat !== 'undefined') ? mxchatChat : {}; | |
| 1354 | - | |
| 1355 | - // The `print_button_*` keys still gate this item for back-compat with | |
| 1356 | - // existing user options. The action is now a transcript download, not print. | |
| 1357 | - if (settings.print_button_enabled === 'on') { | |
| 1358 | - items.push({ | |
| 1359 | - id: 'download-transcript', | |
| 1360 | - label: settings.print_button_label || 'Download Transcript', | |
| 1361 | - icon: '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>', | |
| 1362 | - action: function() { | |
| 1363 | - mxchatDownloadTranscript(botId); | |
| 1364 | - } | |
| 1365 | - }); | |
| 1366 | - } | |
| 1367 | - | |
| 1368 | - return items; | |
| 1369 | -} | |
| 1370 | - | |
| 1371 | -// Builds a clean markdown transcript of the current conversation and triggers | |
| 1372 | -// a file download. Used by the "Download Transcript" menu item. | |
| 1373 | -function mxchatDownloadTranscript(botId) { | |
| 1374 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1375 | - if (!$chatBox || !$chatBox.length) return; | |
| 1376 | - | |
| 1377 | - var settings = (typeof mxchatChat !== 'undefined') ? mxchatChat : {}; | |
| 1378 | - var headerTitle = settings.print_header_title || 'Chat transcript'; | |
| 1379 | - var now = new Date(); | |
| 1380 | - var stamp = now.toLocaleString(); | |
| 1381 | - | |
| 1382 | - var lines = []; | |
| 1383 | - lines.push('# ' + headerTitle); | |
| 1384 | - lines.push(''); | |
| 1385 | - lines.push('Exported: ' + stamp); | |
| 1386 | - lines.push(''); | |
| 1387 | - lines.push('---'); | |
| 1388 | - lines.push(''); | |
| 1389 | - | |
| 1390 | - $chatBox.find('.user-message, .bot-message, .agent-message').each(function() { | |
| 1391 | - var $msg = $(this); | |
| 1392 | - // Skip thinking placeholders and any in-flight temporary messages. | |
| 1393 | - if ($msg.find('.thinking-dots').length) return; | |
| 1394 | - if ($msg.hasClass('temporary-message')) return; | |
| 1395 | - | |
| 1396 | - var sender; | |
| 1397 | - if ($msg.hasClass('user-message')) sender = 'User'; | |
| 1398 | - else if ($msg.hasClass('agent-message')) sender = 'Live Agent'; | |
| 1399 | - else sender = 'AI Agent'; | |
| 1400 | - | |
| 1401 | - // Strip interactive UI from the cloned message so we get the conversation text. | |
| 1402 | - var $clone = $msg.clone(); | |
| 1403 | - $clone.find('.copy-button, .message-toolbar, .mxchat-copy, button, script, style').remove(); | |
| 1404 | - var text = $clone.text().replace(/ /g, ' ').replace(/[ \t]+\n/g, '\n').replace(/\n{3,}/g, '\n\n').trim(); | |
| 1405 | - if (!text) return; | |
| 1406 | - | |
| 1407 | - lines.push('**' + sender + '**'); | |
| 1408 | - lines.push(''); | |
| 1409 | - lines.push(text); | |
| 1410 | - lines.push(''); | |
| 1411 | - }); | |
| 1412 | - | |
| 1413 | - var content = lines.join('\n'); | |
| 1414 | - var iso = now.toISOString().replace(/[:.]/g, '-').slice(0, 19); | |
| 1415 | - var fname = 'mxchat-transcript-' + iso + '.md'; | |
| 1416 | - var blob = new Blob([content], { type: 'text/markdown;charset=utf-8' }); | |
| 1417 | - var url = URL.createObjectURL(blob); | |
| 1418 | - var a = document.createElement('a'); | |
| 1419 | - a.href = url; | |
| 1420 | - a.download = fname; | |
| 1421 | - a.style.display = 'none'; | |
| 1422 | - document.body.appendChild(a); | |
| 1423 | - a.click(); | |
| 1424 | - setTimeout(function() { | |
| 1425 | - if (a.parentNode) a.parentNode.removeChild(a); | |
| 1426 | - URL.revokeObjectURL(url); | |
| 1427 | - }, 100); | |
| 1428 | -} | |
| 1429 | - | |
| 1430 | -// Reads the bot bubble's actual computed bg+fg and writes them as CSS vars | |
| 1431 | -// on the menu wrap, so the dropdown matches whatever paints the bubble — | |
| 1432 | -// saved options, AI theme CSS, or the mxchat-theme add-on. | |
| 1433 | -function mxchatSyncMenuColors(botId, $wrap) { | |
| 1434 | - if (!$wrap || !$wrap.length) return; | |
| 1435 | - var $bot = $wrap.closest('.mxchat-chatbot-wrapper').find('.bot-message').not('.temporary-message').first(); | |
| 1436 | - if (!$bot.length) return; | |
| 1437 | - var cs = window.getComputedStyle($bot[0]); | |
| 1438 | - if (cs.backgroundColor && cs.backgroundColor !== 'rgba(0, 0, 0, 0)' && cs.backgroundColor !== 'transparent') { | |
| 1439 | - $wrap[0].style.setProperty('--mxchat-menu-bg', cs.backgroundColor); | |
| 1440 | - } | |
| 1441 | - // Bot text color usually lives on a child div, not .bot-message itself. | |
| 1442 | - var $textChild = $bot.find('[style*="color"]').first(); | |
| 1443 | - var fg = ($textChild.length ? window.getComputedStyle($textChild[0]).color : cs.color); | |
| 1444 | - if (fg) $wrap[0].style.setProperty('--mxchat-menu-fg', fg); | |
| 1445 | -} | |
| 1446 | - | |
| 1447 | -// One-time per-widget init: renders menu items, wires open/close, | |
| 1448 | -// outside-click, Escape, and arrow-key navigation. If no items, hides the trigger. | |
| 1449 | -function mxchatInitHeaderMenu(botId) { | |
| 1450 | - var $wrap = $('.mxchat-header-menu-wrap[data-bot-id="' + botId + '"]').first(); | |
| 1451 | - if (!$wrap.length || $wrap.data('mxchatMenuReady')) return; | |
| 1452 | - | |
| 1453 | - var $trigger = $wrap.find('.mxchat-menu-trigger'); | |
| 1454 | - var $menu = $wrap.find('.mxchat-header-menu'); | |
| 1455 | - var items = mxchatGetHeaderMenuItems(botId); | |
| 1456 | - | |
| 1457 | - // Initial color sync — covers normal page load. | |
| 1458 | - mxchatSyncMenuColors(botId, $wrap); | |
| 1459 | - | |
| 1460 | - if (!items.length) { | |
| 1461 | - $trigger.hide(); | |
| 1462 | - $menu.hide(); | |
| 1463 | - $wrap.data('mxchatMenuReady', true); | |
| 1464 | - return; | |
| 1465 | - } | |
| 1466 | - | |
| 1467 | - // Build the menu items. | |
| 1468 | - $menu.empty(); | |
| 1469 | - items.forEach(function(item, idx) { | |
| 1470 | - var $btn = $('<button>', { | |
| 1471 | - type: 'button', | |
| 1472 | - 'class': 'mxchat-menu-item', | |
| 1473 | - 'role': 'menuitem', | |
| 1474 | - 'tabindex': '-1', | |
| 1475 | - 'data-menu-id': item.id, | |
| 1476 | - html: '<span class="mxchat-menu-item-icon">' + item.icon + '</span>' + | |
| 1477 | - '<span class="mxchat-menu-item-label"></span>' | |
| 1478 | - }); | |
| 1479 | - $btn.find('.mxchat-menu-item-label').text(item.label); | |
| 1480 | - $btn.on('click', function(e) { | |
| 1481 | - e.preventDefault(); | |
| 1482 | - e.stopPropagation(); | |
| 1483 | - closeMenu(); | |
| 1484 | - try { item.action(); } catch (err) { /* no-op */ } | |
| 1485 | - }); | |
| 1486 | - $menu.append($btn); | |
| 1487 | - }); | |
| 1488 | - | |
| 1489 | - function openMenu() { | |
| 1490 | - // Re-sync each open in case the active theme changed since init. | |
| 1491 | - mxchatSyncMenuColors(botId, $wrap); | |
| 1492 | - $menu.prop('hidden', false).attr('aria-hidden', 'false').addClass('is-open'); | |
| 1493 | - $trigger.attr('aria-expanded', 'true'); | |
| 1494 | - // Focus the first item for keyboard users | |
| 1495 | - setTimeout(function() { | |
| 1496 | - $menu.find('.mxchat-menu-item').first().attr('tabindex', '0').trigger('focus'); | |
| 1497 | - }, 0); | |
| 1498 | - } | |
| 1499 | - function closeMenu(returnFocus) { | |
| 1500 | - $menu.prop('hidden', true).attr('aria-hidden', 'true').removeClass('is-open'); | |
| 1501 | - $trigger.attr('aria-expanded', 'false'); | |
| 1502 | - $menu.find('.mxchat-menu-item').attr('tabindex', '-1'); | |
| 1503 | - if (returnFocus) $trigger.trigger('focus'); | |
| 1504 | - } | |
| 1505 | - | |
| 1506 | - // Toggle on trigger click — stop propagation so the .chatbot-top-bar | |
| 1507 | - // click-to-collapse handler does not fire. | |
| 1508 | - $trigger.on('click', function(e) { | |
| 1509 | - e.preventDefault(); | |
| 1510 | - e.stopPropagation(); | |
| 1511 | - if ($menu.hasClass('is-open')) closeMenu(); | |
| 1512 | - else openMenu(); | |
| 1513 | - }); | |
| 1514 | - | |
| 1515 | - // Don't let clicks inside the menu bubble to the top-bar collapse handler. | |
| 1516 | - $menu.on('click', function(e) { | |
| 1517 | - e.stopPropagation(); | |
| 1518 | - }); | |
| 1519 | - | |
| 1520 | - // Outside click closes the menu. | |
| 1521 | - $(document).on('click.mxchatMenu-' + botId, function(e) { | |
| 1522 | - if (!$menu.hasClass('is-open')) return; | |
| 1523 | - if ($wrap.has(e.target).length || $wrap.is(e.target)) return; | |
| 1524 | - closeMenu(); | |
| 1525 | - }); | |
| 1526 | - | |
| 1527 | - // Keyboard: Escape closes and returns focus; arrow keys move focus; Enter activates. | |
| 1528 | - $menu.on('keydown', '.mxchat-menu-item', function(e) { | |
| 1529 | - var $items = $menu.find('.mxchat-menu-item'); | |
| 1530 | - var idx = $items.index(this); | |
| 1531 | - if (e.key === 'Escape') { | |
| 1532 | - e.preventDefault(); | |
| 1533 | - closeMenu(true); | |
| 1534 | - } else if (e.key === 'ArrowDown') { | |
| 1535 | - e.preventDefault(); | |
| 1536 | - var $next = $items.eq((idx + 1) % $items.length); | |
| 1537 | - $items.attr('tabindex', '-1'); | |
| 1538 | - $next.attr('tabindex', '0').trigger('focus'); | |
| 1539 | - } else if (e.key === 'ArrowUp') { | |
| 1540 | - e.preventDefault(); | |
| 1541 | - var $prev = $items.eq((idx - 1 + $items.length) % $items.length); | |
| 1542 | - $items.attr('tabindex', '-1'); | |
| 1543 | - $prev.attr('tabindex', '0').trigger('focus'); | |
| 1544 | - } else if (e.key === 'Enter' || e.key === ' ') { | |
| 1545 | - e.preventDefault(); | |
| 1546 | - $(this).trigger('click'); | |
| 1547 | - } | |
| 1548 | - }); | |
| 1549 | - $trigger.on('keydown', function(e) { | |
| 1550 | - if (e.key === 'Escape' && $menu.hasClass('is-open')) { | |
| 1551 | - e.preventDefault(); | |
| 1552 | - closeMenu(true); | |
| 1553 | - } else if ((e.key === 'ArrowDown' || e.key === 'Enter' || e.key === ' ') && !$menu.hasClass('is-open')) { | |
| 1554 | - e.preventDefault(); | |
| 1555 | - openMenu(); | |
| 1556 | - } | |
| 1557 | - }); | |
| 1558 | - | |
| 1559 | - $wrap.data('mxchatMenuReady', true); | |
| 1560 | -} | |
| 1561 | - | |
| 1562 | -// Initialize header menus for every rendered widget on DOM ready. | |
| 1563 | -$(function() { | |
| 1564 | - $('.mxchat-header-menu-wrap').each(function() { | |
| 1565 | - var botId = $(this).data('bot-id'); | |
| 1566 | - if (botId) mxchatInitHeaderMenu(botId); | |
| 1567 | - }); | |
| 1568 | -}); | |
| 1569 | - | |
| 1570 | -function appendMessage(sender, messageText = '', messageHtml = '', images = [], isTemporary = false, botId = 'default') { | |
| 810 | +function appendMessage(sender, messageText = '', messageHtml = '', images = [], isTemporary = false) { | |
| 1571 | 811 | try { |
| 1572 | 812 | // Determine styles based on sender type |
| 1573 | 813 | let messageClass, bgColor, fontColor; |
| 1574 | 814 | |
| @@ -1589,29 +829,25 @@ | ||
| 1589 | 829 | } |
| 1590 | 830 | |
| 1591 | 831 | const messageDiv = $('<div>') |
| 1592 | 832 | .addClass(messageClass) |
| 1593 | - .attr('dir', 'auto'); | |
| 1594 | - | |
| 1595 | - // Only apply inline colors if AI theme is not active (let CSS handle it) | |
| 1596 | - var skipColors = shouldSkipInlineColors(botId); | |
| 1597 | - if (skipColors) { | |
| 1598 | - messageDiv.css({ | |
| 1599 | - 'margin-bottom': '1em' | |
| 1600 | - }); | |
| 1601 | - } else { | |
| 1602 | - messageDiv.css({ | |
| 833 | + .attr('dir', 'auto') | |
| 834 | + .css({ | |
| 1603 | 835 | 'background': bgColor, |
| 1604 | 836 | 'color': fontColor, |
| 1605 | 837 | 'margin-bottom': '1em' |
| 1606 | 838 | }); |
| 839 | + | |
| 840 | + // Process the message content based on sender | |
| 841 | + let fullMessage; | |
| 842 | + if (sender === "user") { | |
| 843 | + // For user messages, apply linkify after sanitization | |
| 844 | + fullMessage = linkify(formatBoldText(convertNewlinesToBreaks(formatCodeBlocks(messageText)))); | |
| 845 | + } else { | |
| 846 | + // For bot/agent messages, preserve HTML | |
| 847 | + fullMessage = messageText; | |
| 1607 | 848 | } |
| 1608 | 849 | |
| 1609 | - // Process the message content - always run linkify to convert markdown | |
| 1610 | - // links and format text. linkify() handles existing HTML safely via | |
| 1611 | - // negative lookaheads that skip URLs already inside <a> tags. | |
| 1612 | - let fullMessage = linkify(messageText); | |
| 1613 | - | |
| 1614 | 850 | // Add images if provided |
| 1615 | 851 | if (images && images.length > 0) { |
| 1616 | 852 | fullMessage += '<div class="image-gallery" dir="auto">'; |
| 1617 | 853 | images.forEach(img => { |
| @@ -1617,9 +853,9 @@ | ||
| 1617 | 853 | images.forEach(img => { |
| 1618 | 854 | const safeTitle = sanitizeUserInput(img.title); |
| 1619 | 855 | const safeUrl = encodeURI(img.image_url); |
| 1620 | 856 | const safeThumbnail = encodeURI(img.thumbnail_url); |
| 1621 | - | |
| 857 | + | |
| 1622 | 858 | fullMessage += ` |
| 1623 | 859 | <div style="margin-bottom: 10px;"> |
| 1624 | 860 | <strong>${safeTitle}</strong><br> |
| 1625 | 861 | <a href="${safeUrl}" target="_blank"> |
| @@ -1631,14 +867,9 @@ | ||
| 1631 | 867 | } |
| 1632 | 868 | |
| 1633 | 869 | // Append HTML content if provided |
| 1634 | 870 | if (messageHtml && sender !== "user") { |
| 1635 | - // Only add line breaks if there's actual text content before the HTML | |
| 1636 | - if (fullMessage && fullMessage.trim()) { | |
| 1637 | - fullMessage += '<br><br>' + messageHtml; | |
| 1638 | - } else { | |
| 1639 | - fullMessage = messageHtml; | |
| 1640 | - } | |
| 871 | + fullMessage += '<br><br>' + messageHtml; | |
| 1641 | 872 | } |
| 1642 | 873 | |
| 1643 | 874 | messageDiv.html(fullMessage); |
| 1644 | 875 | |
| @@ -1645,66 +876,58 @@ | ||
| 1645 | 876 | if (isTemporary) { |
| 1646 | 877 | messageDiv.addClass('temporary-message'); |
| 1647 | 878 | } |
| 1648 | 879 | |
| 1649 | - // Append to the correct chatbot instance's chat-box | |
| 1650 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1651 | - messageDiv.hide().appendTo($chatBox).fadeIn(300, function() { | |
| 880 | + messageDiv.hide().appendTo('#chat-box').fadeIn(300, function() { | |
| 1652 | 881 | // FIXED: Use event delegation for link tracking |
| 1653 | 882 | if (sender === "bot" || sender === "agent") { |
| 1654 | - attachLinkTracking(messageDiv, messageText, botId); | |
| 883 | + attachLinkTracking(messageDiv, messageText); | |
| 1655 | 884 | } |
| 1656 | - | |
| 885 | + | |
| 1657 | 886 | if (sender === "bot") { |
| 1658 | - const lastUserMessage = $chatBox.find('.user-message').last(); | |
| 887 | + const lastUserMessage = $('#chat-box').find('.user-message').last(); | |
| 1659 | 888 | if (lastUserMessage.length) { |
| 1660 | - scrollElementToTop(lastUserMessage, botId); | |
| 889 | + scrollElementToTop(lastUserMessage); | |
| 1661 | 890 | } |
| 1662 | 891 | } |
| 1663 | - | |
| 1664 | - if ((sender === "bot" || sender === "agent") && !isTemporary) { | |
| 1665 | - mxchatEnsurePrintRoot(botId); | |
| 1666 | - } | |
| 1667 | 892 | }); |
| 1668 | 893 | |
| 1669 | 894 | if (messageText.id) { |
| 1670 | - var instance = MxChatInstances.get(botId); | |
| 1671 | - instance.lastSeenMessageId = messageText.id; | |
| 1672 | - hideNotification(botId); | |
| 895 | + lastSeenMessageId = messageText.id; | |
| 896 | + hideNotification(); | |
| 1673 | 897 | } |
| 1674 | 898 | } catch (error) { |
| 1675 | - // Error rendering message - silently continue | |
| 899 | + console.error("Error rendering message:", error); | |
| 1676 | 900 | } |
| 1677 | 901 | } |
| 1678 | 902 | |
| 1679 | -// Helper function to attach link tracking with proper event handling | |
| 1680 | -function attachLinkTracking(messageDiv, messageText, botId) { | |
| 1681 | - botId = botId || 'default'; | |
| 903 | +// NEW: Helper function to attach link tracking with proper event handling | |
| 904 | +function attachLinkTracking(messageDiv, messageText) { | |
| 1682 | 905 | // Use a slight delay to ensure DOM is ready |
| 1683 | 906 | setTimeout(function() { |
| 1684 | 907 | const links = messageDiv.find('a[href]').not('[data-tracked]'); |
| 1685 | - | |
| 908 | + | |
| 1686 | 909 | links.each(function() { |
| 1687 | 910 | const $link = $(this); |
| 1688 | 911 | const originalHref = $link.attr('href'); |
| 1689 | - | |
| 912 | + | |
| 1690 | 913 | // Mark as tracked to avoid duplicate handlers |
| 1691 | 914 | $link.attr('data-tracked', 'true'); |
| 1692 | - | |
| 915 | + | |
| 1693 | 916 | // Only track external URLs |
| 1694 | 917 | if (originalHref && (originalHref.startsWith('http://') || originalHref.startsWith('https://'))) { |
| 1695 | 918 | // Remove any existing click handlers first |
| 1696 | 919 | $link.off('click.tracking'); |
| 1697 | - | |
| 920 | + | |
| 1698 | 921 | // Add new click handler with namespace |
| 1699 | 922 | $link.on('click.tracking', function(e) { |
| 1700 | 923 | e.preventDefault(); |
| 1701 | 924 | e.stopPropagation(); |
| 1702 | - | |
| 1703 | - const messageContext = typeof messageText === 'string' | |
| 1704 | - ? messageText.substring(0, 200) | |
| 925 | + | |
| 926 | + const messageContext = typeof messageText === 'string' | |
| 927 | + ? messageText.substring(0, 200) | |
| 1705 | 928 | : ''; |
| 1706 | - | |
| 929 | + | |
| 1707 | 930 | // Track the click |
| 1708 | 931 | $.ajax({ |
| 1709 | 932 | url: mxchatChat.ajax_url, |
| 1710 | 933 | type: 'POST', |
| @@ -1709,9 +932,9 @@ | ||
| 1709 | 932 | url: mxchatChat.ajax_url, |
| 1710 | 933 | type: 'POST', |
| 1711 | 934 | data: { |
| 1712 | 935 | action: 'mxchat_track_url_click', |
| 1713 | - session_id: getChatSession(botId), | |
| 936 | + session_id: getChatSession(), | |
| 1714 | 937 | url: originalHref, |
| 1715 | 938 | message_context: messageContext, |
| 1716 | 939 | nonce: mxchatChat.nonce |
| 1717 | 940 | }, |
| @@ -1723,9 +946,9 @@ | ||
| 1723 | 946 | window.location.href = originalHref; |
| 1724 | 947 | } |
| 1725 | 948 | } |
| 1726 | 949 | }); |
| 1727 | - | |
| 950 | + | |
| 1728 | 951 | return false; // Extra insurance to prevent default |
| 1729 | 952 | }); |
| 1730 | 953 | } |
| 1731 | 954 | }); |
| @@ -1731,12 +954,11 @@ | ||
| 1731 | 954 | }); |
| 1732 | 955 | }, 100); // Small delay to ensure DOM is ready |
| 1733 | 956 | } |
| 1734 | 957 | |
| 1735 | -function replaceLastMessage(sender, responseText, responseHtml = '', images = [], botId = 'default') { | |
| 958 | +function replaceLastMessage(sender, responseText, responseHtml = '', images = []) { | |
| 1736 | 959 | var messageClass = sender === "user" ? "user-message" : sender === "agent" ? "agent-message" : "bot-message"; |
| 1737 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1738 | - var lastMessageDiv = $chatBox.find('.bot-message.temporary-message, .agent-message.temporary-message').last(); | |
| 960 | + var lastMessageDiv = $('#chat-box').find('.bot-message.temporary-message, .agent-message.temporary-message').last(); | |
| 1739 | 961 | |
| 1740 | 962 | // Determine styles |
| 1741 | 963 | let bgColor, fontColor; |
| 1742 | 964 | if (sender === "user") { |
| @@ -1749,20 +971,11 @@ | ||
| 1749 | 971 | bgColor = botMessageBgColor; |
| 1750 | 972 | fontColor = botMessageFontColor; |
| 1751 | 973 | } |
| 1752 | 974 | |
| 1753 | - // Always run linkify to convert markdown links and format text. | |
| 1754 | - // linkify() already handles existing HTML (its URL patterns use negative lookaheads | |
| 1755 | - // to avoid double-processing URLs that are already inside <a> tags). | |
| 1756 | - var fullMessage = linkify(responseText); | |
| 1757 | - | |
| 975 | + var fullMessage = linkify(formatBoldText(convertNewlinesToBreaks(formatCodeBlocks(responseText)))); | |
| 1758 | 976 | if (responseHtml) { |
| 1759 | - // Only add line breaks if there's actual text content before the HTML | |
| 1760 | - if (fullMessage && fullMessage.trim()) { | |
| 1761 | - fullMessage += '<br><br>' + responseHtml; | |
| 1762 | - } else { | |
| 1763 | - fullMessage = responseHtml; | |
| 1764 | - } | |
| 977 | + fullMessage += '<br><br>' + responseHtml; | |
| 1765 | 978 | } |
| 1766 | 979 | |
| 1767 | 980 | if (images.length > 0) { |
| 1768 | 981 | fullMessage += '<div class="image-gallery" dir="auto">'; |
| @@ -1778,427 +991,158 @@ | ||
| 1778 | 991 | fullMessage += '</div>'; |
| 1779 | 992 | } |
| 1780 | 993 | |
| 1781 | 994 | if (lastMessageDiv.length) { |
| 1782 | - // Replace content immediately to prevent visual gap between thinking dots and response | |
| 1783 | - lastMessageDiv | |
| 1784 | - .html(fullMessage) | |
| 1785 | - .removeClass('bot-message user-message temporary-message') | |
| 1786 | - .addClass(messageClass) | |
| 1787 | - .attr('dir', 'auto'); | |
| 1788 | - | |
| 1789 | - // Only apply inline colors if AI theme is not active (let CSS handle it) | |
| 1790 | - var skipColors = mxchatChat.skip_inline_colors || shouldSkipInlineColors(botId); | |
| 1791 | - if (!skipColors) { | |
| 1792 | - lastMessageDiv.css({ | |
| 1793 | - 'background-color': bgColor, | |
| 1794 | - 'color': fontColor, | |
| 1795 | - }); | |
| 1796 | - } | |
| 1797 | - | |
| 1798 | - // Handle link tracking and scroll | |
| 1799 | - if (sender === "bot" || sender === "agent") { | |
| 1800 | - attachLinkTracking(lastMessageDiv, responseText, botId); | |
| 1801 | - | |
| 1802 | - const lastUserMessage = $chatBox.find('.user-message').last(); | |
| 1803 | - if (lastUserMessage.length) { | |
| 1804 | - scrollElementToTop(lastUserMessage, botId); | |
| 1805 | - } | |
| 1806 | - // Show notification if chat is hidden | |
| 1807 | - var $floatingChatbot = getElement(botId, 'floating-chatbot'); | |
| 1808 | - if ($floatingChatbot.hasClass('hidden')) { | |
| 1809 | - showNotification(botId); | |
| 1810 | - } | |
| 1811 | - } | |
| 1812 | - | |
| 1813 | - // Re-enable chat input after response is displayed | |
| 1814 | - enableChatInput(botId); | |
| 1815 | - | |
| 1816 | - if (sender === "bot" || sender === "agent") { | |
| 1817 | - mxchatEnsurePrintRoot(botId); | |
| 1818 | - } | |
| 995 | + lastMessageDiv.fadeOut(200, function() { | |
| 996 | + $(this) | |
| 997 | + .html(fullMessage) | |
| 998 | + .removeClass('bot-message user-message') | |
| 999 | + .addClass(messageClass) | |
| 1000 | + .attr('dir', 'auto') | |
| 1001 | + .css({ | |
| 1002 | + 'background-color': bgColor, | |
| 1003 | + 'color': fontColor, | |
| 1004 | + }) | |
| 1005 | + .removeClass('temporary-message') | |
| 1006 | + .fadeIn(200, function() { | |
| 1007 | + // FIXED: Use the helper function for link tracking | |
| 1008 | + if (sender === "bot" || sender === "agent") { | |
| 1009 | + attachLinkTracking($(this), responseText); | |
| 1010 | + } | |
| 1011 | + | |
| 1012 | + if (sender === "bot" || sender === "agent") { | |
| 1013 | + const lastUserMessage = $('#chat-box').find('.user-message').last(); | |
| 1014 | + if (lastUserMessage.length) { | |
| 1015 | + scrollElementToTop(lastUserMessage); | |
| 1016 | + } | |
| 1017 | + // Show notification if chat is hidden | |
| 1018 | + if ($('#floating-chatbot').hasClass('hidden')) { | |
| 1019 | + showNotification(); | |
| 1020 | + } | |
| 1021 | + } | |
| 1022 | + }); | |
| 1023 | + }); | |
| 1819 | 1024 | } else { |
| 1820 | - appendMessage(sender, responseText, responseHtml, images, false, botId); | |
| 1821 | - // Re-enable chat input after response is displayed | |
| 1822 | - enableChatInput(botId); | |
| 1025 | + appendMessage(sender, responseText, responseHtml, images); | |
| 1823 | 1026 | } |
| 1824 | 1027 | } |
| 1825 | 1028 | |
| 1826 | 1029 | |
| 1827 | - function appendThinkingMessage(botId) { | |
| 1828 | - botId = botId || 'default'; | |
| 1030 | + function appendThinkingMessage() { | |
| 1031 | + // Remove any existing thinking dots first | |
| 1032 | + $('.thinking-dots').remove(); | |
| 1829 | 1033 | |
| 1830 | - // Don't show thinking dots in live agent mode - message is just forwarded to a human | |
| 1831 | - var indicator = getElementDOM(botId, 'chat-mode-indicator'); | |
| 1832 | - if (indicator && indicator.textContent === 'Live Agent') { | |
| 1833 | - return; | |
| 1834 | - } | |
| 1835 | - | |
| 1836 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1837 | - | |
| 1838 | - // Remove any existing thinking dots in this bot's chat first | |
| 1839 | - $chatBox.find('.thinking-dots').remove(); | |
| 1840 | - | |
| 1841 | - // Check if we should skip inline colors (AI theme is active) | |
| 1842 | - var skipColors = shouldSkipInlineColors(botId); | |
| 1843 | - | |
| 1844 | 1034 | // Retrieve the bot message font color and background color |
| 1845 | 1035 | var botMessageFontColor = mxchatChat.bot_message_font_color; |
| 1846 | 1036 | var botMessageBgColor = mxchatChat.bot_message_bg_color; |
| 1847 | 1037 | |
| 1848 | - // Build thinking dots HTML - skip inline colors if AI theme is active | |
| 1849 | - var dotStyle = skipColors ? '' : ' style="background-color: ' + botMessageFontColor + ';"'; | |
| 1038 | + | |
| 1850 | 1039 | var thinkingHtml = '<div class="thinking-dots-container">' + |
| 1851 | 1040 | '<div class="thinking-dots">' + |
| 1852 | - '<span class="dot"' + dotStyle + '></span>' + | |
| 1853 | - '<span class="dot"' + dotStyle + '></span>' + | |
| 1854 | - '<span class="dot"' + dotStyle + '></span>' + | |
| 1041 | + '<span class="dot" style="background-color: ' + botMessageFontColor + ';"></span>' + | |
| 1042 | + '<span class="dot" style="background-color: ' + botMessageFontColor + ';"></span>' + | |
| 1043 | + '<span class="dot" style="background-color: ' + botMessageFontColor + ';"></span>' + | |
| 1855 | 1044 | '</div>' + |
| 1856 | 1045 | '</div>'; |
| 1857 | 1046 | |
| 1858 | - // Append the thinking dots to this bot's chat container - skip inline colors if AI theme is active | |
| 1859 | - var messageStyle = skipColors ? '' : ' style="background-color: ' + botMessageBgColor + '; color: ' + botMessageFontColor + ';"'; | |
| 1860 | - $chatBox.append('<div class="bot-message temporary-message"' + messageStyle + '>' + thinkingHtml + '</div>'); | |
| 1861 | - scrollToBottom(botId); | |
| 1047 | + // Append the thinking dots to the chat container (or within the temporary message div) | |
| 1048 | + $("#chat-box").append('<div class="bot-message temporary-message" style="background-color: ' + botMessageBgColor + ';">' + thinkingHtml + '</div>'); | |
| 1049 | + scrollToBottom(); | |
| 1862 | 1050 | } |
| 1051 | + | |
| 1052 | + function removeThinkingDots() { | |
| 1053 | + $('.thinking-dots').closest('.temporary-message').remove(); | |
| 1054 | + } | |
| 1863 | 1055 | |
| 1864 | - function removeThinkingDots(botId) { | |
| 1865 | - botId = botId || 'default'; | |
| 1866 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1867 | - // Remove by temporary-message class first, then fall back to any bot-message containing thinking dots | |
| 1868 | - $chatBox.find('.thinking-dots').closest('.temporary-message').remove(); | |
| 1869 | - $chatBox.find('.bot-message .thinking-dots').closest('.bot-message').remove(); | |
| 1870 | - } | |
| 1871 | 1056 | |
| 1872 | 1057 | // ==================================== |
| 1873 | 1058 | // TEXT FORMATTING & PROCESSING |
| 1874 | 1059 | // ==================================== |
| 1875 | 1060 | |
| 1061 | + | |
| 1876 | 1062 | function linkify(inputText) { |
| 1877 | - if (!inputText) { | |
| 1878 | - return ''; | |
| 1879 | - } | |
| 1063 | + if (!inputText) return ''; | |
| 1064 | + | |
| 1065 | + // Process markdown headers | |
| 1066 | + let processedText = formatMarkdownHeaders(inputText); | |
| 1067 | + | |
| 1068 | + // Process markdown links | |
| 1069 | + const markdownLinkPattern = /\[([^\]]+)\]\((https?:\/\/[^\s]+)\)/g; | |
| 1070 | + processedText = processedText.replace(markdownLinkPattern, (match, text, url) => { | |
| 1071 | + const safeUrl = encodeURI(url); | |
| 1072 | + const safeText = sanitizeUserInput(text); | |
| 1073 | + return `<a href="${safeUrl}" target="${linkTarget}">${safeText}</a>`; | |
| 1074 | + }); | |
| 1880 | 1075 | |
| 1881 | - // Helper function to check if URL is already encoded | |
| 1882 | - function isUrlEncoded(url) { | |
| 1883 | - // Check for % followed by exactly 2 hex digits | |
| 1884 | - return /%[0-9a-fA-F]{2}/.test(url); | |
| 1885 | - } | |
| 1076 | + // Process phone numbers (tel:) | |
| 1077 | + const phonePattern = /\[([^\]]+)\]\((tel:[\d+]+)\)/g; | |
| 1078 | + processedText = processedText.replace(phonePattern, (match, text, phone) => { | |
| 1079 | + const safePhone = encodeURI(phone); | |
| 1080 | + const safeText = sanitizeUserInput(text); | |
| 1081 | + return `<a href="${safePhone}">${safeText}</a>`; | |
| 1082 | + }); | |
| 1886 | 1083 | |
| 1887 | - // Helper function to safely encode URLs only if needed | |
| 1888 | - function safeEncodeUrl(url) { | |
| 1889 | - // If URL already contains encoded characters, return as-is | |
| 1890 | - if (isUrlEncoded(url)) { | |
| 1891 | - return url; | |
| 1892 | - } | |
| 1893 | - // Otherwise, encode it | |
| 1894 | - return encodeURI(url); | |
| 1895 | - } | |
| 1896 | - | |
| 1897 | - // Process markdown headers FIRST | |
| 1898 | - let processedText = formatMarkdownHeaders(inputText); | |
| 1899 | - | |
| 1900 | - // Process text styling (bold, italic, strikethrough) | |
| 1901 | - processedText = formatTextStyling(processedText); | |
| 1902 | - | |
| 1903 | - // Process code blocks BEFORE processing links | |
| 1904 | - processedText = formatCodeBlocks(processedText); | |
| 1905 | - | |
| 1906 | - // Process markdown tables BEFORE converting newlines to paragraphs | |
| 1907 | - processedText = formatMarkdownTables(processedText); | |
| 1908 | - | |
| 1909 | - // NOW convert to paragraphs | |
| 1910 | - processedText = convertNewlinesToBreaks(processedText); | |
| 1911 | - | |
| 1912 | - // IMPORTANT: Handle citation-style brackets FIRST [URL] | |
| 1913 | - // This prevents them from being processed as markdown links | |
| 1914 | - // Match [URL] where URL is a complete URL in square brackets (common in AI citations) | |
| 1915 | - processedText = processedText.replace(/\[(https?:\/\/[^\]]+)\]/g, (match, url) => { | |
| 1916 | - // Clean the URL of any trailing punctuation | |
| 1917 | - let cleanUrl = url.replace(/[.,;!?]+$/, ''); | |
| 1918 | - const safeUrl = safeEncodeUrl(cleanUrl); | |
| 1919 | - // Return as a proper link without the brackets | |
| 1920 | - return `<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`; | |
| 1921 | - }); | |
| 1922 | - | |
| 1923 | - // Process markdown links: [text](url) and [](url) | |
| 1924 | - // Uses balanced parenthesis matching to handle URLs containing parens | |
| 1925 | - // (e.g. PDF filenames with dates like (2025-08-28).pdf) | |
| 1926 | - processedText = (function(input) { | |
| 1927 | - var result = ''; | |
| 1928 | - var i = 0; | |
| 1929 | - while (i < input.length) { | |
| 1930 | - // Look for [ at current position | |
| 1931 | - if (input[i] === '[') { | |
| 1932 | - // Find closing ] | |
| 1933 | - var closeBracket = input.indexOf(']', i + 1); | |
| 1934 | - if (closeBracket === -1 || closeBracket + 1 >= input.length || input[closeBracket + 1] !== '(') { | |
| 1935 | - result += input[i]; | |
| 1936 | - i++; | |
| 1937 | - continue; | |
| 1938 | - } | |
| 1939 | - var linkText = input.substring(i + 1, closeBracket); | |
| 1940 | - // Check if URL starts with http | |
| 1941 | - var urlStart = closeBracket + 2; | |
| 1942 | - if (!input.substring(urlStart).match(/^https?:\/\//)) { | |
| 1943 | - result += input[i]; | |
| 1944 | - i++; | |
| 1945 | - continue; | |
| 1946 | - } | |
| 1947 | - // Find balanced closing paren | |
| 1948 | - var depth = 1; | |
| 1949 | - var j = urlStart; | |
| 1950 | - while (j < input.length && depth > 0) { | |
| 1951 | - if (input[j] === '(') depth++; | |
| 1952 | - else if (input[j] === ')') depth--; | |
| 1953 | - if (depth > 0) j++; | |
| 1954 | - } | |
| 1955 | - if (depth !== 0) { | |
| 1956 | - result += input[i]; | |
| 1957 | - i++; | |
| 1958 | - continue; | |
| 1959 | - } | |
| 1960 | - var url = input.substring(urlStart, j); | |
| 1961 | - var cleanUrl = url.replace(/[\].,;!?]+$/, ''); | |
| 1962 | - var encodedUrl = safeEncodeUrl(cleanUrl); | |
| 1963 | - if (!linkText || !linkText.trim()) { | |
| 1964 | - result += '<a href="' + encodedUrl + '" target="' + linkTarget + '">' + cleanUrl + '</a>'; | |
| 1965 | - } else { | |
| 1966 | - var safeText = sanitizeUserInput(linkText); | |
| 1967 | - result += '<a href="' + encodedUrl + '" target="' + linkTarget + '">' + safeText + '</a>'; | |
| 1968 | - } | |
| 1969 | - i = j + 1; // Skip past the closing ) | |
| 1970 | - } else { | |
| 1971 | - result += input[i]; | |
| 1972 | - i++; | |
| 1973 | - } | |
| 1974 | - } | |
| 1975 | - return result; | |
| 1976 | - })(processedText); | |
| 1977 | - | |
| 1978 | - // Process phone numbers: [text](tel:number) | |
| 1979 | - const phonePattern = /\[([^\]]+)\]\((tel:[\d+\-\s()]+)\)/g; | |
| 1980 | - processedText = processedText.replace(phonePattern, (match, text, phone) => { | |
| 1981 | - const safePhone = safeEncodeUrl(phone); | |
| 1982 | - const safeText = sanitizeUserInput(text); | |
| 1983 | - return `<a href="${safePhone}">${safeText}</a>`; | |
| 1984 | - }); | |
| 1985 | - | |
| 1986 | - // Process mailto links: [text](mailto:email) | |
| 1987 | - const mailtoPattern = /\[([^\]]+)\]\((mailto:[^\)]+)\)/g; | |
| 1988 | - processedText = processedText.replace(mailtoPattern, (match, text, mailto) => { | |
| 1989 | - const safeMailto = safeEncodeUrl(mailto); | |
| 1990 | - const safeText = sanitizeUserInput(text); | |
| 1991 | - return `<a href="${safeMailto}">${safeText}</a>`; | |
| 1992 | - }); | |
| 1993 | - | |
| 1994 | - // Process standalone URLs - but NOT if they're already in <a> tags or brackets | |
| 1995 | - // Updated pattern to be more careful about what it matches | |
| 1996 | - const urlPattern = /(^|[^">=\[\]])(https?:\/\/[^\s<"\[\]]+)(?![^<]*<\/a>)(?!\])/gim; | |
| 1997 | - processedText = processedText.replace(urlPattern, (match, prefix, url) => { | |
| 1998 | - // Extra check: make sure this isn't already linked | |
| 1999 | - if (match.includes('href=') || match.includes('</a>')) { | |
| 2000 | - return match; | |
| 2001 | - } | |
| 1084 | + // Process standalone URLs | |
| 1085 | + const urlPattern = /(^|[^">])(https?:\/\/[^\s<]+)/gim; | |
| 1086 | + processedText = processedText.replace(urlPattern, (match, prefix, url) => { | |
| 1087 | + const safeUrl = encodeURI(url); | |
| 1088 | + return `${prefix}<a href="${safeUrl}" target="${linkTarget}">${url}</a>`; | |
| 1089 | + }); | |
| 2002 | 1090 | |
| 2003 | - // Clean trailing punctuation | |
| 2004 | - let cleanUrl = url.replace(/[.,;!?)]+$/, ''); | |
| 2005 | - const safeUrl = safeEncodeUrl(cleanUrl); | |
| 2006 | - return `${prefix}<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`; | |
| 2007 | - }); | |
| 2008 | - | |
| 2009 | - // Process www. URLs - but NOT if they're already in <a> tags or brackets | |
| 2010 | - const wwwPattern = /(^|[^">/\[\]])(www\.[\S]+)(?![^<]*<\/a>)(?!\])/gim; | |
| 2011 | - processedText = processedText.replace(wwwPattern, (match, prefix, url) => { | |
| 2012 | - // Extra check: make sure this isn't already linked | |
| 2013 | - if (match.includes('href=') || match.includes('</a>')) { | |
| 2014 | - return match; | |
| 2015 | - } | |
| 1091 | + // Process www. URLs | |
| 1092 | + const wwwPattern = /(^|[^">])(www\.[\S]+(\b|$))(?![^<]*<\/a>)/gim; | |
| 1093 | + processedText = processedText.replace(wwwPattern, (match, prefix, url) => { | |
| 1094 | + const safeUrl = encodeURI(`http://${url}`); | |
| 1095 | + return `${prefix}<a href="${safeUrl}" target="${linkTarget}">${url}</a>`; | |
| 1096 | + }); | |
| 2016 | 1097 | |
| 2017 | - // Clean trailing punctuation | |
| 2018 | - let cleanUrl = url.replace(/[.,;!?)]+$/, ''); | |
| 2019 | - const safeUrl = safeEncodeUrl(`http://${cleanUrl}`); | |
| 2020 | - return `${prefix}<a href="${safeUrl}" target="${linkTarget}">${cleanUrl}</a>`; | |
| 2021 | - }); | |
| 1098 | + // Add this after your phone pattern | |
| 1099 | + const mailtoPattern = /\[([^\]]+)\]\((mailto:[^\)]+)\)/g; | |
| 1100 | + processedText = processedText.replace(mailtoPattern, (match, text, mailto) => { | |
| 1101 | + const safeMailto = encodeURI(mailto); | |
| 1102 | + const safeText = sanitizeUserInput(text); | |
| 1103 | + return `<a href="${safeMailto}">${safeText}</a>`; | |
| 1104 | + }); | |
| 2022 | 1105 | |
| 2023 | - return processedText; | |
| 2024 | -} | |
| 1106 | + return processedText; | |
| 1107 | + } | |
| 2025 | 1108 | |
| 2026 | 1109 | function formatMarkdownHeaders(text) { |
| 2027 | 1110 | // Handle h1 to h6 headers |
| 2028 | - return text.replace(/^(#{1,6})\s+(.+)$/gm, function(match, hashes, content) { | |
| 1111 | + return text.replace(/^(#{1,6})\s(.+)$/gm, function(match, hashes, content) { | |
| 2029 | 1112 | const level = hashes.length; |
| 2030 | - return `<h${level} class="chat-heading chat-heading-${level}">${content.trim()}</h${level}>`; | |
| 1113 | + return `<h${level} class="chat-heading">${content}</h${level}>`; | |
| 2031 | 1114 | }); |
| 2032 | 1115 | } |
| 2033 | 1116 | |
| 2034 | -function formatTextStyling(text) { | |
| 2035 | - // IMPORTANT: Protect BOTH HTML href and Markdown URLs from formatting | |
| 2036 | - const protectedSegments = []; | |
| 2037 | - let protectedText = text; | |
| 2038 | - | |
| 2039 | - // Step 1a: Protect HTML href="..." attributes | |
| 2040 | - protectedText = protectedText.replace(/href\s*=\s*["']([^"']+)["']/gi, function(match) { | |
| 2041 | - const placeholder = `__PROTECTED_${protectedSegments.length}__`; | |
| 2042 | - protectedSegments.push(match); | |
| 2043 | - return placeholder; | |
| 2044 | - }); | |
| 2045 | - | |
| 2046 | - // Step 1b: Protect Markdown links [text](url) | |
| 2047 | - // This is crucial - we need to protect the URLs in markdown format | |
| 2048 | - protectedText = protectedText.replace(/\[([^\]]*)\]\(([^)]+)\)/g, function(match) { | |
| 2049 | - const placeholder = `__PROTECTED_${protectedSegments.length}__`; | |
| 2050 | - protectedSegments.push(match); | |
| 2051 | - return placeholder; | |
| 2052 | - }); | |
| 2053 | - | |
| 2054 | - // Step 1c: Also protect bare URLs that might exist | |
| 2055 | - protectedText = protectedText.replace(/(https?:\/\/[^\s<>"]+)/gi, function(match) { | |
| 2056 | - const placeholder = `__PROTECTED_${protectedSegments.length}__`; | |
| 2057 | - protectedSegments.push(match); | |
| 2058 | - return placeholder; | |
| 2059 | - }); | |
| 2060 | - | |
| 2061 | - // Step 2: Now apply text styling to the protected text | |
| 2062 | - // Handle bold text (**text**) | |
| 2063 | - protectedText = protectedText.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>'); | |
| 2064 | - | |
| 2065 | - // Handle italic text (*text* or _text_) - Safari-compatible (no lookbehind) | |
| 2066 | - // Match single asterisks that aren't part of bold (**) by checking they're not followed/preceded by another * | |
| 2067 | - protectedText = protectedText.replace(/(?!\*\*)\*([^*\n]+)\*(?!\*)/g, '<em>$1</em>'); | |
| 2068 | - | |
| 2069 | - // Handle underscores for italic - Safari-compatible (no lookbehind) | |
| 2070 | - // Exclude __PROTECTED_N__ placeholders by checking the content doesn't contain PROTECTED | |
| 2071 | - protectedText = protectedText.replace(/(?!__)_((?!PROTECTED)[^_\n]+)_(?!_)/g, '<em>$1</em>'); | |
| 2072 | - | |
| 2073 | - // Handle strikethrough (~~text~~) | |
| 2074 | - protectedText = protectedText.replace(/~~(.*?)~~/g, '<del>$1</del>'); | |
| 2075 | - | |
| 2076 | - // Step 3: Restore all protected segments | |
| 2077 | - protectedSegments.forEach((original, index) => { | |
| 2078 | - const placeholder = `__PROTECTED_${index}__`; | |
| 2079 | - protectedText = protectedText.replace(placeholder, original); | |
| 2080 | - }); | |
| 2081 | - | |
| 2082 | - return protectedText; | |
| 2083 | -} | |
| 2084 | 1117 | function formatBoldText(text) { |
| 2085 | - // This function is kept for compatibility but now uses formatTextStyling | |
| 2086 | - return formatTextStyling(text); | |
| 1118 | + return text.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>'); | |
| 2087 | 1119 | } |
| 2088 | 1120 | |
| 2089 | -function convertNewlinesToBreaks(text) { | |
| 2090 | - // Split the text into paragraphs (marked by double newlines or multiple <br> tags) | |
| 2091 | - const paragraphs = text.split(/(?:\n\n|\<br\>\s*\<br\>)/g); | |
| 1121 | + function convertNewlinesToBreaks(text) { | |
| 1122 | + // Split the text into paragraphs (marked by double newlines or multiple <br> tags) | |
| 1123 | + const paragraphs = text.split(/(?:\n\n|\<br\>\s*\<br\>)/g); | |
| 1124 | + | |
| 1125 | + // Wrap each paragraph in <p> tags | |
| 1126 | + return paragraphs | |
| 1127 | + .map(para => `<p>${para.trim()}</p>`) | |
| 1128 | + .join(''); | |
| 1129 | + } | |
| 2092 | 1130 | |
| 2093 | - // Filter out empty paragraphs and wrap each paragraph in <p> tags | |
| 2094 | - return paragraphs | |
| 2095 | - .map(para => para.trim()) | |
| 2096 | - .filter(para => para.length > 0) // Remove empty paragraphs | |
| 2097 | - .map(para => `<p>${para}</p>`) | |
| 2098 | - .join(''); | |
| 2099 | -} | |
| 2100 | 1131 | function formatCodeBlocks(text) { |
| 2101 | - // Handle fenced code blocks with language specification (```language) | |
| 2102 | - text = text.replace(/```(\w+)?\n?([\s\S]*?)```/g, (match, language, code) => { | |
| 2103 | - const lang = language || 'text'; | |
| 2104 | - const escapedCode = escapeHtml(code.trim()); | |
| 2105 | - return `<div class="mxchat-code-block-container"> | |
| 2106 | - <div class="mxchat-code-header"> | |
| 2107 | - <span class="mxchat-code-language">${lang}</span> | |
| 2108 | - <button class="mxchat-copy-button" aria-label="Copy to clipboard">Copy</button> | |
| 2109 | - </div> | |
| 2110 | - <pre class="mxchat-code-block"><code class="language-${lang}">${escapedCode}</code></pre> | |
| 2111 | - </div>`; | |
| 1132 | + // First handle raw PHP tags | |
| 1133 | + text = text.replace(/(<\?php[\s\S]*?\?>)/g, (match) => { | |
| 1134 | + return `<pre><code class="language-php">${escapeHtml(match)}</code></pre>`; | |
| 2112 | 1135 | }); |
| 2113 | - | |
| 2114 | - // Handle inline code with single backticks | |
| 2115 | - text = text.replace(/`([^`\n]+)`/g, '<code class="mxchat-inline-code">$1</code>'); | |
| 2116 | - | |
| 2117 | - // Handle raw PHP tags (legacy support) | |
| 2118 | - text = text.replace(/(<\?php[\s\S]*?\?>)/g, (match) => { | |
| 2119 | - const escapedCode = escapeHtml(match); | |
| 2120 | - return `<div class="mxchat-code-block-container"> | |
| 2121 | - <div class="mxchat-code-header"> | |
| 2122 | - <span class="mxchat-code-language">php</span> | |
| 2123 | - <button class="mxchat-copy-button" aria-label="Copy to clipboard">Copy</button> | |
| 2124 | - </div> | |
| 2125 | - <pre class="mxchat-code-block"><code class="language-php">${escapedCode}</code></pre> | |
| 2126 | - </div>`; | |
| 1136 | + | |
| 1137 | + // Then handle code blocks with backticks | |
| 1138 | + text = text.replace(/```php5?\n([\s\S]+?)```/gi, (match, code) => { | |
| 1139 | + return `<pre><code class="language-php">${escapeHtml(code)}</code></pre>`; | |
| 2127 | 1140 | }); |
| 2128 | - | |
| 1141 | + | |
| 2129 | 1142 | return text; |
| 2130 | 1143 | } |
| 2131 | - | |
| 2132 | - function formatMarkdownTables(text) { | |
| 2133 | - var lines = text.split('\n'); | |
| 2134 | - var result = []; | |
| 2135 | - var i = 0; | |
| 2136 | - | |
| 2137 | - while (i < lines.length) { | |
| 2138 | - // Check for a table: current line has pipes AND next line is a separator row | |
| 2139 | - if (i + 1 < lines.length && | |
| 2140 | - lines[i].indexOf('|') !== -1 && | |
| 2141 | - /^\s*\|?[\s\-:]+(\|[\s\-:]+)+\|?\s*$/.test(lines[i + 1])) { | |
| 2142 | - | |
| 2143 | - var tableLines = []; | |
| 2144 | - var headerLine = lines[i]; | |
| 2145 | - var separatorLine = lines[i + 1]; | |
| 2146 | - tableLines.push(headerLine); | |
| 2147 | - tableLines.push(separatorLine); | |
| 2148 | - | |
| 2149 | - // Collect remaining table rows | |
| 2150 | - var j = i + 2; | |
| 2151 | - while (j < lines.length && lines[j].indexOf('|') !== -1 && lines[j].trim() !== '') { | |
| 2152 | - tableLines.push(lines[j]); | |
| 2153 | - j++; | |
| 2154 | - } | |
| 2155 | - | |
| 2156 | - // Parse alignment from separator row | |
| 2157 | - var sepCells = separatorLine.split('|').filter(function(c) { return c.trim() !== ''; }); | |
| 2158 | - var alignments = sepCells.map(function(cell) { | |
| 2159 | - var trimmed = cell.trim(); | |
| 2160 | - if (trimmed.charAt(0) === ':' && trimmed.charAt(trimmed.length - 1) === ':') return 'center'; | |
| 2161 | - if (trimmed.charAt(trimmed.length - 1) === ':') return 'right'; | |
| 2162 | - return 'left'; | |
| 2163 | - }); | |
| 2164 | - | |
| 2165 | - // Build HTML table | |
| 2166 | - var html = '<div class="mxchat-table-wrapper"><table class="mxchat-table">'; | |
| 2167 | - | |
| 2168 | - // Header row | |
| 2169 | - var headerCells = tableLines[0].split('|').filter(function(c) { return c.trim() !== ''; }); | |
| 2170 | - html += '<thead><tr>'; | |
| 2171 | - headerCells.forEach(function(cell, idx) { | |
| 2172 | - var align = alignments[idx] || 'left'; | |
| 2173 | - html += '<th style="text-align:' + align + '">' + cell.trim() + '</th>'; | |
| 2174 | - }); | |
| 2175 | - html += '</tr></thead>'; | |
| 2176 | - | |
| 2177 | - // Body rows | |
| 2178 | - html += '<tbody>'; | |
| 2179 | - for (var r = 2; r < tableLines.length; r++) { | |
| 2180 | - var rowCells = tableLines[r].split('|').filter(function(c) { return c.trim() !== ''; }); | |
| 2181 | - html += '<tr>'; | |
| 2182 | - rowCells.forEach(function(cell, idx) { | |
| 2183 | - var align = alignments[idx] || 'left'; | |
| 2184 | - html += '<td style="text-align:' + align + '">' + cell.trim() + '</td>'; | |
| 2185 | - }); | |
| 2186 | - html += '</tr>'; | |
| 2187 | - } | |
| 2188 | - html += '</tbody></table></div>'; | |
| 2189 | - | |
| 2190 | - result.push(html); | |
| 2191 | - i = j; | |
| 2192 | - } else { | |
| 2193 | - result.push(lines[i]); | |
| 2194 | - i++; | |
| 2195 | - } | |
| 2196 | - } | |
| 2197 | - | |
| 2198 | - return result.join('\n'); | |
| 2199 | - } | |
| 2200 | - | |
| 1144 | + | |
| 2201 | 1145 | function sanitizeUserInput(text) { |
| 2202 | 1146 | const div = document.createElement('div'); |
| 2203 | 1147 | div.textContent = text; |
| 2204 | 1148 | return div.innerHTML; |
| @@ -2203,12 +1147,12 @@ | ||
| 2203 | 1147 | div.textContent = text; |
| 2204 | 1148 | return div.innerHTML; |
| 2205 | 1149 | } |
| 2206 | 1150 | |
| 1151 | + | |
| 2207 | 1152 | function escapeHtml(unsafe) { |
| 2208 | - // Skip escaping if it's already escaped or contains HTML code block markup | |
| 2209 | - if (unsafe.includes('<') || unsafe.includes('>') || | |
| 2210 | - unsafe.includes('<pre><code') || unsafe.includes('</code></pre>')) { | |
| 1153 | + // First check if it's already a code block | |
| 1154 | + if (unsafe.includes('<pre><code') || unsafe.includes('</code></pre>')) { | |
| 2211 | 1155 | return unsafe; |
| 2212 | 1156 | } |
| 2213 | 1157 | |
| 2214 | 1158 | return unsafe |
| @@ -2224,25 +1168,15 @@ | ||
| 2224 | 1168 | textArea.innerHTML = text; |
| 2225 | 1169 | return textArea.value; |
| 2226 | 1170 | } |
| 2227 | 1171 | |
| 1172 | + | |
| 2228 | 1173 | // ==================================== |
| 2229 | 1174 | // UI & SCROLLING CONTROLS |
| 2230 | 1175 | // ==================================== |
| 2231 | 1176 | |
| 2232 | - function scrollToBottom(botIdOrInstant, instant) { | |
| 2233 | - // Handle backward compatibility: scrollToBottom() or scrollToBottom(true/false) | |
| 2234 | - var botId = 'default'; | |
| 2235 | - if (typeof botIdOrInstant === 'string') { | |
| 2236 | - botId = botIdOrInstant; | |
| 2237 | - instant = instant || false; | |
| 2238 | - } else if (typeof botIdOrInstant === 'boolean') { | |
| 2239 | - instant = botIdOrInstant; | |
| 2240 | - } else { | |
| 2241 | - instant = false; | |
| 2242 | - } | |
| 2243 | - | |
| 2244 | - var chatBox = getElement(botId, 'chat-box'); | |
| 1177 | + function scrollToBottom(instant = false) { | |
| 1178 | + var chatBox = $('#chat-box'); | |
| 2245 | 1179 | if (instant) { |
| 2246 | 1180 | // Instantly set the scroll position to the bottom |
| 2247 | 1181 | chatBox.scrollTop(chatBox.prop("scrollHeight")); |
| 2248 | 1182 | } else { |
| @@ -2251,15 +1185,15 @@ | ||
| 2251 | 1185 | const scrollHeight = chatBox.prop("scrollHeight"); |
| 2252 | 1186 | const initialScroll = chatBox.scrollTop(); |
| 2253 | 1187 | const distance = scrollHeight - initialScroll; |
| 2254 | 1188 | const duration = 500; // Duration in ms |
| 2255 | - | |
| 1189 | + | |
| 2256 | 1190 | function smoothScroll(timestamp) { |
| 2257 | 1191 | if (!start) start = timestamp; |
| 2258 | 1192 | const progress = timestamp - start; |
| 2259 | 1193 | const currentScroll = initialScroll + (distance * (progress / duration)); |
| 2260 | 1194 | chatBox.scrollTop(currentScroll); |
| 2261 | - | |
| 1195 | + | |
| 2262 | 1196 | if (progress < duration) { |
| 2263 | 1197 | requestAnimationFrame(smoothScroll); |
| 2264 | 1198 | } else { |
| 2265 | 1199 | chatBox.scrollTop(scrollHeight); // Ensure it's exactly at the bottom |
| @@ -2264,37 +1198,33 @@ | ||
| 2264 | 1198 | } else { |
| 2265 | 1199 | chatBox.scrollTop(scrollHeight); // Ensure it's exactly at the bottom |
| 2266 | 1200 | } |
| 2267 | 1201 | } |
| 2268 | - | |
| 1202 | + | |
| 2269 | 1203 | requestAnimationFrame(smoothScroll); |
| 2270 | 1204 | } |
| 2271 | 1205 | } |
| 2272 | - | |
| 2273 | - function scrollElementToTop(element, botId, topOffset) { | |
| 2274 | - botId = botId || 'default'; | |
| 2275 | - topOffset = (typeof topOffset === 'number') ? topOffset : 2; | |
| 2276 | - var chatBox = getElement(botId, 'chat-box'); | |
| 1206 | + | |
| 1207 | + function scrollElementToTop(element) { | |
| 1208 | + var chatBox = $('#chat-box'); | |
| 2277 | 1209 | var elementTop = element.position().top + chatBox.scrollTop(); |
| 2278 | - chatBox.animate({ scrollTop: Math.max(0, elementTop - topOffset) }, 500); | |
| 1210 | + chatBox.animate({ scrollTop: elementTop }, 500); | |
| 2279 | 1211 | } |
| 2280 | - | |
| 2281 | - function showChatWidget(botId) { | |
| 2282 | - botId = botId || 'default'; | |
| 2283 | - var $button = getElement(botId, 'floating-chatbot-button'); | |
| 1212 | + | |
| 1213 | + function showChatWidget() { | |
| 2284 | 1214 | // First ensure display is set |
| 2285 | - $button.css('display', 'flex'); | |
| 1215 | + $('#floating-chatbot-button').css('display', 'flex'); | |
| 2286 | 1216 | // Then handle the fade |
| 2287 | - $button.fadeTo(500, 1); | |
| 1217 | + $('#floating-chatbot-button').fadeTo(500, 1); | |
| 2288 | 1218 | // Force visibility |
| 2289 | - $button.removeClass('hidden'); | |
| 1219 | + $('#floating-chatbot-button').removeClass('hidden'); | |
| 1220 | + //console.log('Showing widget'); | |
| 2290 | 1221 | } |
| 2291 | - | |
| 2292 | - function hideChatWidget(botId) { | |
| 2293 | - botId = botId || 'default'; | |
| 2294 | - var $button = getElement(botId, 'floating-chatbot-button'); | |
| 2295 | - $button.css('display', 'none'); | |
| 2296 | - $button.addClass('hidden'); | |
| 1222 | + | |
| 1223 | + function hideChatWidget() { | |
| 1224 | + $('#floating-chatbot-button').css('display', 'none'); | |
| 1225 | + $('#floating-chatbot-button').addClass('hidden'); | |
| 1226 | + //console.log('Hiding widget'); | |
| 2297 | 1227 | } |
| 2298 | 1228 | |
| 2299 | 1229 | function disableScroll() { |
| 2300 | 1230 | if (isMobile()) { |
| @@ -2323,15 +1253,18 @@ | ||
| 2323 | 1253 | // NOTIFICATION SYSTEM |
| 2324 | 1254 | // ==================================== |
| 2325 | 1255 | |
| 2326 | 1256 | function createNotificationBadge() { |
| 1257 | + //console.log("Creating notification badge..."); | |
| 2327 | 1258 | const chatButton = document.getElementById('floating-chatbot-button'); |
| 2328 | - | |
| 1259 | + //console.log("Chat button found:", !!chatButton); | |
| 1260 | + | |
| 2329 | 1261 | if (!chatButton) return; |
| 2330 | - | |
| 1262 | + | |
| 2331 | 1263 | // Remove any existing badge first |
| 2332 | 1264 | const existingBadge = chatButton.querySelector('.chat-notification-badge'); |
| 2333 | 1265 | if (existingBadge) { |
| 1266 | + //console.log("Removing existing badge"); | |
| 2334 | 1267 | existingBadge.remove(); |
| 2335 | 1268 | } |
| 2336 | 1269 | |
| 2337 | 1270 | notificationBadge = document.createElement('div'); |
| @@ -2353,43 +1286,34 @@ | ||
| 2353 | 1286 | chatButton.appendChild(notificationBadge); |
| 2354 | 1287 | |
| 2355 | 1288 | } |
| 2356 | 1289 | |
| 2357 | - function showNotification(botId) { | |
| 2358 | - botId = botId || 'default'; | |
| 2359 | - const badge = getElementDOM(botId, 'chat-notification-badge'); | |
| 2360 | - var $floatingChatbot = getElement(botId, 'floating-chatbot'); | |
| 2361 | - if (badge && $floatingChatbot.hasClass('hidden')) { | |
| 1290 | + function showNotification() { | |
| 1291 | + const badge = document.getElementById('chat-notification-badge'); | |
| 1292 | + if (badge && $('#floating-chatbot').hasClass('hidden')) { | |
| 2362 | 1293 | badge.style.display = 'block'; |
| 2363 | 1294 | badge.textContent = '1'; |
| 2364 | 1295 | } |
| 2365 | 1296 | } |
| 2366 | - | |
| 2367 | - function hideNotification(botId) { | |
| 2368 | - botId = botId || 'default'; | |
| 2369 | - const badge = getElementDOM(botId, 'chat-notification-badge'); | |
| 1297 | + | |
| 1298 | + function hideNotification() { | |
| 1299 | + const badge = document.getElementById('chat-notification-badge'); | |
| 2370 | 1300 | if (badge) { |
| 2371 | 1301 | badge.style.display = 'none'; |
| 2372 | 1302 | } |
| 2373 | 1303 | } |
| 2374 | - | |
| 2375 | - function startNotificationChecking(botId) { | |
| 2376 | - botId = botId || 'default'; | |
| 1304 | + | |
| 1305 | + function startNotificationChecking() { | |
| 2377 | 1306 | const chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on'; |
| 2378 | 1307 | if (!chatPersistenceEnabled) return; |
| 2379 | - | |
| 2380 | - createNotificationBadge(botId); | |
| 2381 | - var instance = MxChatInstances.get(botId); | |
| 2382 | - instance.notificationCheckInterval = setInterval(function() { | |
| 2383 | - checkForNewMessages(botId); | |
| 2384 | - }, 30000); // Check every 30 seconds | |
| 1308 | + | |
| 1309 | + createNotificationBadge(); | |
| 1310 | + notificationCheckInterval = setInterval(checkForNewMessages, 30000); // Check every 30 seconds | |
| 2385 | 1311 | } |
| 2386 | - | |
| 2387 | - function stopNotificationChecking(botId) { | |
| 2388 | - botId = botId || 'default'; | |
| 2389 | - var instance = MxChatInstances.get(botId); | |
| 2390 | - if (instance.notificationCheckInterval) { | |
| 2391 | - clearInterval(instance.notificationCheckInterval); | |
| 1312 | + | |
| 1313 | + function stopNotificationChecking() { | |
| 1314 | + if (notificationCheckInterval) { | |
| 1315 | + clearInterval(notificationCheckInterval); | |
| 2392 | 1316 | } |
| 2393 | 1317 | } |
| 2394 | 1318 | |
| 2395 | 1319 | function checkForNewMessages() { |
| @@ -2415,35 +1339,50 @@ | ||
| 2415 | 1339 | }); |
| 2416 | 1340 | } |
| 2417 | 1341 | |
| 2418 | 1342 | |
| 2419 | -// ==================================== | |
| 2420 | -// LIVE AGENT FUNCTIONALITY | |
| 2421 | -// ==================================== | |
| 2422 | - | |
| 2423 | -function startPolling(botId) { | |
| 2424 | - botId = botId || 'default'; | |
| 2425 | - var instance = MxChatInstances.get(botId); | |
| 2426 | - // Clear any existing interval first | |
| 2427 | - stopPolling(botId); | |
| 2428 | - instance.pollingInterval = setInterval(function() { | |
| 2429 | - checkForAgentMessages(botId); | |
| 2430 | - }, 5000); | |
| 2431 | -} | |
| 2432 | - | |
| 2433 | -function stopPolling(botId) { | |
| 2434 | - botId = botId || 'default'; | |
| 2435 | - var instance = MxChatInstances.get(botId); | |
| 2436 | - if (instance.pollingInterval) { | |
| 2437 | - clearInterval(instance.pollingInterval); | |
| 2438 | - instance.pollingInterval = null; | |
| 1343 | + // ==================================== | |
| 1344 | + // LIVE AGENT FUNCTIONALITY | |
| 1345 | + // ==================================== | |
| 1346 | + | |
| 1347 | + function updateChatModeIndicator(mode) { | |
| 1348 | + const indicator = document.getElementById('chat-mode-indicator'); | |
| 1349 | + if (indicator) { | |
| 1350 | + // For Live Agent, keep as is; for AI mode, use the customized text | |
| 1351 | + if (mode === 'agent') { | |
| 1352 | + indicator.textContent = 'Live Agent'; | |
| 1353 | + } else { | |
| 1354 | + // Get the custom AI agent text from a data attribute we'll add to the element | |
| 1355 | + const customAiText = indicator.getAttribute('data-ai-text') || 'AI Agent'; | |
| 1356 | + indicator.textContent = customAiText; | |
| 1357 | + } | |
| 1358 | + } | |
| 1359 | + // Start or stop polling based on mode | |
| 1360 | + if (mode === 'agent') { | |
| 1361 | + startPolling(); | |
| 1362 | + } else { | |
| 1363 | + stopPolling(); | |
| 1364 | + } | |
| 2439 | 1365 | } |
| 2440 | -} | |
| 2441 | - | |
| 2442 | -function checkForAgentMessages(botId) { | |
| 2443 | - botId = botId || 'default'; | |
| 2444 | - var instance = MxChatInstances.get(botId); | |
| 2445 | - const sessionId = getChatSession(botId); | |
| 1366 | + | |
| 1367 | + function startPolling() { | |
| 1368 | + // Clear any existing interval first | |
| 1369 | + stopPolling(); | |
| 1370 | + // Start new polling interval | |
| 1371 | + pollingInterval = setInterval(checkForAgentMessages, 5000); | |
| 1372 | + //console.log("Started agent message polling"); | |
| 1373 | + } | |
| 1374 | + | |
| 1375 | + function stopPolling() { | |
| 1376 | + if (pollingInterval) { | |
| 1377 | + clearInterval(pollingInterval); | |
| 1378 | + pollingInterval = null; | |
| 1379 | + //console.log("Stopped agent message polling"); | |
| 1380 | + } | |
| 1381 | + } | |
| 1382 | + | |
| 1383 | +function checkForAgentMessages() { | |
| 1384 | + const sessionId = getChatSession(); | |
| 2446 | 1385 | $.ajax({ |
| 2447 | 1386 | url: mxchatChat.ajax_url, |
| 2448 | 1387 | type: 'POST', |
| 2449 | 1388 | dataType: 'json', |
| @@ -2449,44 +1388,35 @@ | ||
| 2449 | 1388 | dataType: 'json', |
| 2450 | 1389 | data: { |
| 2451 | 1390 | action: 'mxchat_fetch_new_messages', |
| 2452 | 1391 | session_id: sessionId, |
| 2453 | - last_seen_id: instance.lastSeenMessageId, | |
| 2454 | - persistence_enabled: 'true', | |
| 1392 | + last_seen_id: lastSeenMessageId, | |
| 1393 | + persistence_enabled: 'true', // Add this too | |
| 2455 | 1394 | nonce: mxchatChat.nonce |
| 2456 | 1395 | }, |
| 2457 | 1396 | success: function (response) { |
| 2458 | 1397 | if (response.success && response.data?.new_messages) { |
| 2459 | 1398 | let hasNewMessage = false; |
| 2460 | - | |
| 1399 | + | |
| 2461 | 1400 | response.data.new_messages.forEach(function (message) { |
| 2462 | - if (message.role === "agent" && !instance.processedMessageIds.has(message.id)) { | |
| 1401 | + if (message.role === "agent" && !processedMessageIds.has(message.id)) { | |
| 2463 | 1402 | hasNewMessage = true; |
| 2464 | - appendMessage("agent", message.content, '', [], false, botId); | |
| 2465 | - instance.lastSeenMessageId = message.id; | |
| 2466 | - instance.processedMessageIds.add(message.id); | |
| 1403 | + // CHANGE THIS LINE: | |
| 1404 | + appendMessage("agent", message.content); // Instead of replaceLastMessage | |
| 1405 | + lastSeenMessageId = message.id; | |
| 1406 | + processedMessageIds.add(message.id); | |
| 2467 | 1407 | } |
| 2468 | 1408 | }); |
| 2469 | 1409 | |
| 2470 | - if (hasNewMessage) { | |
| 2471 | - enableChatInput(botId); | |
| 1410 | + if (hasNewMessage && $('#floating-chatbot').hasClass('hidden')) { | |
| 1411 | + showNotification(); | |
| 2472 | 1412 | } |
| 2473 | - | |
| 2474 | - var $floatingChatbot = getElement(botId, 'floating-chatbot'); | |
| 2475 | - if (hasNewMessage && $floatingChatbot.hasClass('hidden')) { | |
| 2476 | - showNotification(botId); | |
| 2477 | - } | |
| 2478 | - | |
| 2479 | - scrollToBottom(botId, true); | |
| 1413 | + | |
| 1414 | + scrollToBottom(true); | |
| 2480 | 1415 | } |
| 2481 | - | |
| 2482 | - // Handle chat mode transitions (e.g. agent ended chat via !endchat) | |
| 2483 | - if (response.success && response.data?.chat_mode) { | |
| 2484 | - updateChatModeIndicator(response.data.chat_mode, botId); | |
| 2485 | - } | |
| 2486 | 1416 | }, |
| 2487 | 1417 | error: function (xhr, status, error) { |
| 2488 | - // Polling error - silently continue | |
| 1418 | + //console.error("Polling error:", xhr, status, error); | |
| 2489 | 1419 | } |
| 2490 | 1420 | }); |
| 2491 | 1421 | } |
| 2492 | 1422 | |
| @@ -2492,166 +1422,120 @@ | ||
| 2492 | 1422 | |
| 2493 | 1423 | // ==================================== |
| 2494 | 1424 | // CHAT HISTORY & PERSISTENCE |
| 2495 | 1425 | // ==================================== |
| 2496 | - | |
| 2497 | -function loadChatHistory(botId, onComplete) { | |
| 2498 | - botId = botId || 'default'; | |
| 2499 | - var instance = MxChatInstances.get(botId); | |
| 2500 | - | |
| 2501 | - // Prevent duplicate loading | |
| 2502 | - if (instance.chatHistoryLoaded) { | |
| 2503 | - if (onComplete) onComplete(); | |
| 2504 | - return; | |
| 2505 | - } | |
| 2506 | - | |
| 2507 | - // Use getChatSession which returns null if no session exists (does NOT create one) | |
| 2508 | - var sessionId = getChatSession(botId); | |
| 2509 | - var chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on'; | |
| 2510 | - | |
| 2511 | - // No session yet — nothing to load. History will load after first message via ensureSession. | |
| 2512 | - if (!sessionId) { | |
| 2513 | - instance.chatHistoryLoaded = true; | |
| 2514 | - if (onComplete) onComplete(); | |
| 2515 | - return; | |
| 2516 | - } | |
| 2517 | - | |
| 2518 | - if (chatPersistenceEnabled && sessionId) { | |
| 2519 | - $.ajax({ | |
| 2520 | - url: mxchatChat.ajax_url, | |
| 2521 | - type: 'POST', | |
| 2522 | - dataType: 'json', | |
| 2523 | - data: { | |
| 2524 | - action: 'mxchat_fetch_conversation_history', | |
| 2525 | - session_id: sessionId | |
| 2526 | - }, | |
| 2527 | - success: function(response) { | |
| 2528 | - // Handle session reset (IP changed while user was away) | |
| 2529 | - if (response.success === false && response.data && response.data.action === 'reset_session') { | |
| 2530 | - // Silent reset — new session but don't clear UI | |
| 2531 | - MxChatInstances.silentResetSession(botId); | |
| 2532 | - instance.chatHistoryLoaded = true; // Prevent retry loop | |
| 2533 | - if (onComplete) onComplete(); | |
| 2534 | - return; | |
| 2535 | - } | |
| 2536 | - | |
| 2537 | - // Check if the response indicates success | |
| 2538 | - if (response.success) { | |
| 2539 | - // Handle case where conversation data exists and is an array | |
| 2540 | - if (response.data && Array.isArray(response.data.conversation)) { | |
| 2541 | - var $chatBox = getElement(botId, 'chat-box'); | |
| 1426 | + | |
| 1427 | + function loadChatHistory() { | |
| 1428 | + var sessionId = getChatSession(); | |
| 1429 | + var chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on'; | |
| 1430 | + | |
| 1431 | + if (chatPersistenceEnabled && sessionId) { | |
| 1432 | + $.ajax({ | |
| 1433 | + url: mxchatChat.ajax_url, | |
| 1434 | + type: 'POST', | |
| 1435 | + dataType: 'json', | |
| 1436 | + data: { | |
| 1437 | + action: 'mxchat_fetch_conversation_history', | |
| 1438 | + session_id: sessionId | |
| 1439 | + }, | |
| 1440 | + success: function(response) { | |
| 1441 | + if (response.success && response.data && Array.isArray(response.data.conversation)) { | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + var $chatBox = $('#chat-box'); | |
| 2542 | 1445 | var $fragment = $(document.createDocumentFragment()); |
| 2543 | - let highestMessageId = instance.lastSeenMessageId; | |
| 2544 | - | |
| 2545 | - // Update chat mode if provided | |
| 1446 | + let highestMessageId = lastSeenMessageId; | |
| 1447 | + | |
| 2546 | 1448 | if (response.data.chat_mode) { |
| 2547 | - updateChatModeIndicator(response.data.chat_mode, botId); | |
| 1449 | + updateChatModeIndicator(response.data.chat_mode); | |
| 2548 | 1450 | } |
| 2549 | - | |
| 2550 | - // Only process if there are actual messages | |
| 2551 | - if (response.data.conversation.length > 0) { | |
| 2552 | - // IMPORTANT: Clear existing messages before loading history | |
| 2553 | - $chatBox.empty(); | |
| 2554 | - | |
| 2555 | - $.each(response.data.conversation, function(index, message) { | |
| 2556 | - // Skip agent messages if persistence is off | |
| 2557 | - if (!chatPersistenceEnabled && message.role === 'agent') { | |
| 2558 | - return; | |
| 2559 | - } | |
| 2560 | - | |
| 2561 | - var messageClass, messageBgColor, messageFontColor; | |
| 2562 | - | |
| 2563 | - switch (message.role) { | |
| 2564 | - case 'user': | |
| 2565 | - messageClass = 'user-message'; | |
| 2566 | - messageBgColor = userMessageBgColor; | |
| 2567 | - messageFontColor = userMessageFontColor; | |
| 2568 | - break; | |
| 2569 | - case 'agent': | |
| 2570 | - messageClass = 'agent-message'; | |
| 2571 | - messageBgColor = liveAgentMessageBgColor; | |
| 2572 | - messageFontColor = liveAgentMessageFontColor; | |
| 2573 | - break; | |
| 2574 | - default: | |
| 2575 | - messageClass = 'bot-message'; | |
| 2576 | - messageBgColor = botMessageBgColor; | |
| 2577 | - messageFontColor = botMessageFontColor; | |
| 2578 | - break; | |
| 2579 | - } | |
| 2580 | - | |
| 2581 | - var messageElement = $('<div>').addClass(messageClass) | |
| 2582 | - .css({ | |
| 2583 | - 'background': messageBgColor, | |
| 2584 | - 'color': messageFontColor | |
| 2585 | - }); | |
| 2586 | - | |
| 2587 | - var content = message.content; | |
| 2588 | - content = content.replace(/\\'/g, "'").replace(/\\"/g, '"'); | |
| 2589 | - content = decodeHTMLEntities(content); | |
| 2590 | - | |
| 2591 | - // Skip linkify for messages containing structured HTML | |
| 2592 | - // (forms, product cards, galleries, etc.) to avoid | |
| 2593 | - // markdown formatting corrupting HTML attributes | |
| 2594 | - // (e.g. underscores in name="field_name" becoming <em> tags) | |
| 2595 | - if (content.includes("mxchat-product-card") || | |
| 2596 | - content.includes("mxchat-image-gallery") || | |
| 2597 | - content.includes("mxchat-featured-products") || | |
| 2598 | - content.includes("<form") || | |
| 2599 | - content.includes("<input") || | |
| 2600 | - content.includes("<select") || | |
| 2601 | - content.includes("<textarea")) { | |
| 2602 | - messageElement.html(content); | |
| 2603 | - } else { | |
| 2604 | - var formattedContent = linkify(content); | |
| 2605 | - messageElement.html(formattedContent); | |
| 2606 | - } | |
| 2607 | - | |
| 2608 | - $fragment.append(messageElement); | |
| 2609 | - | |
| 2610 | - // Track message IDs | |
| 1451 | + | |
| 1452 | + $.each(response.data.conversation, function(index, message) { | |
| 1453 | + // Skip agent messages if persistence is off | |
| 1454 | + if (!chatPersistenceEnabled && message.role === 'agent') { | |
| 1455 | + return; | |
| 1456 | + } | |
| 1457 | + | |
| 1458 | + var messageClass, messageBgColor, messageFontColor; | |
| 1459 | + | |
| 1460 | + switch (message.role) { | |
| 1461 | + case 'user': | |
| 1462 | + messageClass = 'user-message'; | |
| 1463 | + messageBgColor = userMessageBgColor; | |
| 1464 | + messageFontColor = userMessageFontColor; | |
| 1465 | + break; | |
| 1466 | + case 'agent': | |
| 1467 | + messageClass = 'agent-message'; | |
| 1468 | + messageBgColor = liveAgentMessageBgColor; | |
| 1469 | + messageFontColor = liveAgentMessageFontColor; | |
| 1470 | + break; | |
| 1471 | + default: | |
| 1472 | + messageClass = 'bot-message'; | |
| 1473 | + messageBgColor = botMessageBgColor; | |
| 1474 | + messageFontColor = botMessageFontColor; | |
| 1475 | + break; | |
| 1476 | + } | |
| 1477 | + | |
| 1478 | + var messageElement = $('<div>').addClass(messageClass) | |
| 1479 | + .css({ | |
| 1480 | + 'background': messageBgColor, | |
| 1481 | + 'color': messageFontColor | |
| 1482 | + }); | |
| 1483 | + | |
| 1484 | + var content = message.content; | |
| 1485 | + content = content.replace(/\\'/g, "'").replace(/\\"/g, '"'); | |
| 1486 | + content = decodeHTMLEntities(content); | |
| 1487 | + | |
| 1488 | + if (content.includes("mxchat-product-card") || content.includes("mxchat-image-gallery")) { | |
| 1489 | + messageElement.html(content); | |
| 1490 | + } else { | |
| 1491 | + var formattedContent = linkify( | |
| 1492 | + formatBoldText( | |
| 1493 | + convertNewlinesToBreaks(formatCodeBlocks(content)) | |
| 1494 | + ) | |
| 1495 | + ); | |
| 1496 | + messageElement.html(formattedContent); | |
| 1497 | + } | |
| 1498 | + | |
| 1499 | + $fragment.append(messageElement); | |
| 1500 | + | |
| 1501 | + // In loadChatHistory, change this part: | |
| 2611 | 1502 | if (message.id) { |
| 2612 | 1503 | highestMessageId = Math.max(highestMessageId, message.id); |
| 2613 | - instance.processedMessageIds.add(message.id); | |
| 1504 | + processedMessageIds.add(message.id); // Add all message IDs to processed set | |
| 2614 | 1505 | } |
| 2615 | - }); | |
| 2616 | - | |
| 2617 | - // Only append messages and scroll if we have content | |
| 2618 | - $chatBox.append($fragment); | |
| 2619 | - scrollToBottom(botId, true); | |
| 2620 | - | |
| 2621 | - // Collapse quick questions if we have conversation history | |
| 2622 | - // BUT skip auto-collapse for embedded bots (they should stay expanded) | |
| 2623 | - if (hasQuickQuestions(botId) && !isEmbeddedBot(botId)) { | |
| 2624 | - collapseQuickQuestions(botId); | |
| 1506 | + }); | |
| 1507 | + | |
| 1508 | + $chatBox.append($fragment); | |
| 1509 | + scrollToBottom(true); | |
| 1510 | + | |
| 1511 | + if (response.data.conversation.length > 0 && hasQuickQuestions()) { | |
| 1512 | + collapseQuickQuestions(); | |
| 1513 | + } | |
| 1514 | + | |
| 1515 | + // Update lastSeenMessageId after history loads | |
| 1516 | + lastSeenMessageId = highestMessageId; | |
| 1517 | + | |
| 1518 | + // Only update chat mode if persistence is enabled | |
| 1519 | + if (chatPersistenceEnabled && response.data.conversation.length > 0) { | |
| 1520 | + var lastMessage = response.data.conversation[response.data.conversation.length - 1]; | |
| 1521 | + if (lastMessage.role === 'agent') { | |
| 1522 | + updateChatModeIndicator('agent'); | |
| 2625 | 1523 | } |
| 2626 | - | |
| 2627 | - // Update lastSeenMessageId after history loads | |
| 2628 | - instance.lastSeenMessageId = highestMessageId; | |
| 2629 | - | |
| 2630 | - // Only update chat mode if persistence is enabled and we have messages | |
| 2631 | - if (chatPersistenceEnabled) { | |
| 2632 | - var lastMessage = response.data.conversation[response.data.conversation.length - 1]; | |
| 2633 | - if (lastMessage.role === 'agent') { | |
| 2634 | - updateChatModeIndicator('agent', botId); | |
| 2635 | - } | |
| 2636 | - } | |
| 2637 | - | |
| 2638 | - // Mark as loaded ONLY after successful load | |
| 2639 | - instance.chatHistoryLoaded = true; | |
| 2640 | 1524 | } |
| 1525 | + } else { | |
| 1526 | + console.warn("No conversation history found."); | |
| 2641 | 1527 | } |
| 1528 | + }, | |
| 1529 | + error: function(xhr, status, error) { | |
| 1530 | + //console.error("Error loading chat history:", status, error); | |
| 1531 | + appendMessage("bot", "Unable to load chat history."); | |
| 2642 | 1532 | } |
| 2643 | - if (onComplete) onComplete(); | |
| 2644 | - }, | |
| 2645 | - error: function(xhr, status, error) { | |
| 2646 | - // Error loading chat history - silently continue | |
| 2647 | - if (onComplete) onComplete(); | |
| 2648 | - } | |
| 2649 | - }); | |
| 2650 | - } else { | |
| 2651 | - if (onComplete) onComplete(); | |
| 1533 | + }); | |
| 1534 | + } else { | |
| 1535 | + console.warn("Chat persistence is disabled or no session ID found. Not loading history."); | |
| 1536 | + } | |
| 2652 | 1537 | } |
| 2653 | -} | |
| 2654 | 1538 | |
| 2655 | 1539 | |
| 2656 | 1540 | // ==================================== |
| 2657 | 1541 | // FILE UPLOAD FUNCTIONALITY |
| @@ -2663,42 +1547,40 @@ | ||
| 2663 | 1547 | element.addEventListener(eventType, handler); |
| 2664 | 1548 | } |
| 2665 | 1549 | } |
| 2666 | 1550 | |
| 2667 | - function showActivePdf(filename, botId) { | |
| 2668 | - botId = botId || 'default'; | |
| 2669 | - const container = getElementDOM(botId, 'active-pdf-container'); | |
| 2670 | - const nameElement = getElementDOM(botId, 'active-pdf-name'); | |
| 2671 | - | |
| 1551 | + function showActivePdf(filename) { | |
| 1552 | + const container = document.getElementById('active-pdf-container'); | |
| 1553 | + const nameElement = document.getElementById('active-pdf-name'); | |
| 1554 | + | |
| 2672 | 1555 | if (!container || !nameElement) { |
| 1556 | + //console.error('PDF container elements not found'); | |
| 2673 | 1557 | return; |
| 2674 | 1558 | } |
| 2675 | - | |
| 1559 | + | |
| 2676 | 1560 | nameElement.textContent = filename; |
| 2677 | 1561 | container.style.display = 'flex'; |
| 2678 | 1562 | } |
| 2679 | - | |
| 2680 | - function showActiveWord(filename, botId) { | |
| 2681 | - botId = botId || 'default'; | |
| 2682 | - const container = getElementDOM(botId, 'active-word-container'); | |
| 2683 | - const nameElement = getElementDOM(botId, 'active-word-name'); | |
| 2684 | - | |
| 1563 | + | |
| 1564 | + function showActiveWord(filename) { | |
| 1565 | + const container = document.getElementById('active-word-container'); | |
| 1566 | + const nameElement = document.getElementById('active-word-name'); | |
| 1567 | + | |
| 2685 | 1568 | if (!container || !nameElement) { |
| 1569 | + //console.error('Word document container elements not found'); | |
| 2686 | 1570 | return; |
| 2687 | 1571 | } |
| 2688 | - | |
| 1572 | + | |
| 2689 | 1573 | nameElement.textContent = filename; |
| 2690 | 1574 | container.style.display = 'flex'; |
| 2691 | 1575 | } |
| 2692 | - | |
| 2693 | - function removeActivePdf(botId) { | |
| 2694 | - botId = botId || 'default'; | |
| 2695 | - var instance = MxChatInstances.get(botId); | |
| 2696 | - const container = getElementDOM(botId, 'active-pdf-container'); | |
| 2697 | - const nameElement = getElementDOM(botId, 'active-pdf-name'); | |
| 2698 | - | |
| 2699 | - if (!container || !nameElement || !instance.activePdfFile) return; | |
| 2700 | - | |
| 1576 | + | |
| 1577 | + function removeActivePdf() { | |
| 1578 | + const container = document.getElementById('active-pdf-container'); | |
| 1579 | + const nameElement = document.getElementById('active-pdf-name'); | |
| 1580 | + | |
| 1581 | + if (!container || !nameElement || !activePdfFile) return; | |
| 1582 | + | |
| 2701 | 1583 | fetch(mxchatChat.ajax_url, { |
| 2702 | 1584 | method: 'POST', |
| 2703 | 1585 | headers: { |
| 2704 | 1586 | 'Content-Type': 'application/x-www-form-urlencoded', |
| @@ -2704,9 +1586,9 @@ | ||
| 2704 | 1586 | 'Content-Type': 'application/x-www-form-urlencoded', |
| 2705 | 1587 | }, |
| 2706 | 1588 | body: new URLSearchParams({ |
| 2707 | 1589 | 'action': 'mxchat_remove_pdf', |
| 2708 | - 'session_id': getChatSession(botId), | |
| 1590 | + 'session_id': sessionId, | |
| 2709 | 1591 | 'nonce': mxchatChat.nonce |
| 2710 | 1592 | }) |
| 2711 | 1593 | }) |
| 2712 | 1594 | .then(response => response.json()) |
| @@ -2718,12 +1600,12 @@ | ||
| 2718 | 1600 | appendMessage('bot', 'PDF removed.'); |
| 2719 | 1601 | } |
| 2720 | 1602 | }) |
| 2721 | 1603 | .catch(error => { |
| 2722 | - // Error removing PDF - silently continue | |
| 1604 | + //console.error('Error removing PDF:', error); | |
| 2723 | 1605 | }); |
| 2724 | 1606 | } |
| 2725 | - | |
| 1607 | + | |
| 2726 | 1608 | function removeActiveWord() { |
| 2727 | 1609 | const container = document.getElementById('active-word-container'); |
| 2728 | 1610 | const nameElement = document.getElementById('active-word-name'); |
| 2729 | 1611 | |
| @@ -2749,53 +1631,56 @@ | ||
| 2749 | 1631 | appendMessage('bot', 'Word document removed.'); |
| 2750 | 1632 | } |
| 2751 | 1633 | }) |
| 2752 | 1634 | .catch(error => { |
| 2753 | - // Error removing Word document - silently continue | |
| 1635 | + //console.error('Error removing Word document:', error); | |
| 2754 | 1636 | }); |
| 2755 | 1637 | } |
| 2756 | - | |
| 1638 | + | |
| 2757 | 1639 | // ==================================== |
| 2758 | 1640 | // CONSENT & COMPLIANCE (GDPR) |
| 2759 | 1641 | // ==================================== |
| 2760 | - | |
| 2761 | - function initializeChatVisibility(botId) { | |
| 2762 | - botId = botId || 'default'; | |
| 2763 | - const complianzEnabled = mxchatChat.complianz_toggle === 'on' || | |
| 2764 | - mxchatChat.complianz_toggle === '1' || | |
| 1642 | + | |
| 1643 | + function initializeChatVisibility() { | |
| 1644 | + //console.log('Initializing chat visibility'); | |
| 1645 | + const complianzEnabled = mxchatChat.complianz_toggle === 'on' || | |
| 1646 | + mxchatChat.complianz_toggle === '1' || | |
| 2765 | 1647 | mxchatChat.complianz_toggle === 1; |
| 2766 | - | |
| 1648 | + | |
| 2767 | 1649 | if (complianzEnabled && typeof cmplz_has_consent === "function" && typeof complianz !== 'undefined') { |
| 2768 | 1650 | // Initial check |
| 2769 | - checkConsentAndShowChat(botId); | |
| 2770 | - | |
| 1651 | + checkConsentAndShowChat(); | |
| 1652 | + | |
| 2771 | 1653 | // Listen for consent changes |
| 2772 | 1654 | $(document).on('cmplz_status_change', function(event) { |
| 2773 | - checkConsentAndShowChat(botId); | |
| 1655 | + //console.log('Status change detected'); | |
| 1656 | + checkConsentAndShowChat(); | |
| 2774 | 1657 | }); |
| 2775 | 1658 | } else { |
| 2776 | 1659 | // If Complianz is not enabled, always show |
| 2777 | - getElement(botId, 'floating-chatbot-button') | |
| 1660 | + $('#floating-chatbot-button') | |
| 2778 | 1661 | .css('display', 'flex') |
| 2779 | 1662 | .removeClass('hidden no-consent') |
| 2780 | 1663 | .fadeTo(500, 1); |
| 2781 | - | |
| 1664 | + | |
| 2782 | 1665 | // Also check pre-chat message when Complianz is not enabled |
| 2783 | - checkPreChatDismissal(botId); | |
| 1666 | + checkPreChatDismissal(); | |
| 2784 | 1667 | } |
| 2785 | 1668 | } |
| 2786 | 1669 | |
| 2787 | - | |
| 2788 | - function checkConsentAndShowChat(botId) { | |
| 2789 | - botId = botId || 'default'; | |
| 1670 | + | |
| 1671 | + function checkConsentAndShowChat() { | |
| 2790 | 1672 | var consentStatus = cmplz_has_consent('marketing'); |
| 2791 | 1673 | var consentType = complianz.consenttype; |
| 2792 | - | |
| 2793 | - let $widget = getElement(botId, 'floating-chatbot-button'); | |
| 2794 | - let $chatbot = getElement(botId, 'floating-chatbot'); | |
| 2795 | - let $preChat = getElement(botId, 'pre-chat-message'); | |
| 2796 | - | |
| 1674 | + | |
| 1675 | + //console.log('Checking consent:', {status: consentStatus,type: consentType}); | |
| 1676 | + | |
| 1677 | + let $widget = $('#floating-chatbot-button'); | |
| 1678 | + let $chatbot = $('#floating-chatbot'); | |
| 1679 | + let $preChat = $('#pre-chat-message'); | |
| 1680 | + | |
| 2797 | 1681 | if (consentStatus === true) { |
| 1682 | + //console.log('Consent granted - showing widget'); | |
| 2798 | 1683 | $widget |
| 2799 | 1684 | .removeClass('no-consent') |
| 2800 | 1685 | .css('display', 'flex') |
| 2801 | 1686 | .removeClass('hidden') |
| @@ -2800,12 +1685,13 @@ | ||
| 2800 | 1685 | .css('display', 'flex') |
| 2801 | 1686 | .removeClass('hidden') |
| 2802 | 1687 | .fadeTo(500, 1); |
| 2803 | 1688 | $chatbot.removeClass('no-consent'); |
| 2804 | - | |
| 1689 | + | |
| 2805 | 1690 | // Show pre-chat message if not dismissed |
| 2806 | - checkPreChatDismissal(botId); | |
| 1691 | + checkPreChatDismissal(); | |
| 2807 | 1692 | } else { |
| 1693 | + //console.log('No consent - hiding widget'); | |
| 2808 | 1694 | $widget |
| 2809 | 1695 | .addClass('no-consent') |
| 2810 | 1696 | .fadeTo(500, 0, function() { |
| 2811 | 1697 | $(this) |
| @@ -2812,9 +1698,9 @@ | ||
| 2812 | 1698 | .css('display', 'none') |
| 2813 | 1699 | .addClass('hidden'); |
| 2814 | 1700 | }); |
| 2815 | 1701 | $chatbot.addClass('no-consent'); |
| 2816 | - | |
| 1702 | + | |
| 2817 | 1703 | // Hide pre-chat message when no consent |
| 2818 | 1704 | $preChat.hide(); |
| 2819 | 1705 | } |
| 2820 | 1706 | } |
| @@ -2822,38 +1708,46 @@ | ||
| 2822 | 1708 | |
| 2823 | 1709 | // ==================================== |
| 2824 | 1710 | // PRE-CHAT MESSAGE HANDLING |
| 2825 | 1711 | // ==================================== |
| 2826 | - | |
| 2827 | - function checkPreChatDismissal(botId) { | |
| 2828 | - botId = botId || 'default'; | |
| 2829 | - try { | |
| 2830 | - var dismissedAt = localStorage.getItem('mxchat_pre_chat_dismissed_' + botId); | |
| 2831 | - if (dismissedAt) { | |
| 2832 | - // Re-show after 24 hours | |
| 2833 | - var elapsed = Date.now() - parseInt(dismissedAt, 10); | |
| 2834 | - if (elapsed < 86400000) { | |
| 2835 | - getElement(botId, 'pre-chat-message').hide(); | |
| 2836 | - return; | |
| 1712 | + | |
| 1713 | + function checkPreChatDismissal() { | |
| 1714 | + $.ajax({ | |
| 1715 | + url: mxchatChat.ajax_url, | |
| 1716 | + type: 'POST', | |
| 1717 | + data: { | |
| 1718 | + action: 'mxchat_check_pre_chat_message_status', | |
| 1719 | + _ajax_nonce: mxchatChat.nonce | |
| 1720 | + }, | |
| 1721 | + success: function(response) { | |
| 1722 | + if (response.success && !response.data.dismissed) { | |
| 1723 | + $('#pre-chat-message').fadeIn(250); | |
| 1724 | + } else { | |
| 1725 | + $('#pre-chat-message').hide(); | |
| 2837 | 1726 | } |
| 2838 | - // Expired — clear and show again | |
| 2839 | - localStorage.removeItem('mxchat_pre_chat_dismissed_' + botId); | |
| 1727 | + }, | |
| 1728 | + error: function() { | |
| 1729 | + //console.error('Failed to check pre-chat message dismissal status.'); | |
| 2840 | 1730 | } |
| 2841 | - getElement(botId, 'pre-chat-message').fadeIn(250); | |
| 2842 | - } catch (e) { | |
| 2843 | - // localStorage unavailable — show the message | |
| 2844 | - getElement(botId, 'pre-chat-message').fadeIn(250); | |
| 2845 | - } | |
| 1731 | + }); | |
| 2846 | 1732 | } |
| 2847 | - | |
| 2848 | - function handlePreChatDismissal(botId) { | |
| 2849 | - botId = botId || 'default'; | |
| 2850 | - getElement(botId, 'pre-chat-message').fadeOut(200); | |
| 2851 | - try { | |
| 2852 | - localStorage.setItem('mxchat_pre_chat_dismissed_' + botId, String(Date.now())); | |
| 2853 | - } catch (e) { | |
| 2854 | - // localStorage unavailable — dismissal won't persist | |
| 2855 | - } | |
| 1733 | + | |
| 1734 | + function handlePreChatDismissal() { | |
| 1735 | + $('#pre-chat-message').fadeOut(200); | |
| 1736 | + $.ajax({ | |
| 1737 | + url: mxchatChat.ajax_url, | |
| 1738 | + type: 'POST', | |
| 1739 | + data: { | |
| 1740 | + action: 'mxchat_dismiss_pre_chat_message', | |
| 1741 | + _ajax_nonce: mxchatChat.nonce | |
| 1742 | + }, | |
| 1743 | + success: function() { | |
| 1744 | + $('#pre-chat-message').hide(); | |
| 1745 | + }, | |
| 1746 | + error: function() { | |
| 1747 | + //console.error('Failed to dismiss pre-chat message.'); | |
| 1748 | + } | |
| 1749 | + }); | |
| 2856 | 1750 | } |
| 2857 | 1751 | |
| 2858 | 1752 | |
| 2859 | 1753 | // ==================================== |
| @@ -2879,104 +1773,78 @@ | ||
| 2879 | 1773 | // ==================================== |
| 2880 | 1774 | |
| 2881 | 1775 | $(document).on('click', '.mxchat-popular-question', function () { |
| 2882 | 1776 | var question = $(this).text(); |
| 2883 | - var botId = getBotIdFromElement(this); | |
| 2884 | - | |
| 1777 | + | |
| 2885 | 1778 | // Append the question as if the user typed it |
| 2886 | - appendMessage("user", question, '', [], false, botId); | |
| 2887 | - | |
| 1779 | + appendMessage("user", question); | |
| 1780 | + | |
| 2888 | 1781 | // Only collapse if there are questions |
| 2889 | - if (hasQuickQuestions(botId)) { | |
| 2890 | - collapseQuickQuestions(botId); | |
| 1782 | + if (hasQuickQuestions()) { | |
| 1783 | + collapseQuickQuestions(); | |
| 2891 | 1784 | } |
| 2892 | - | |
| 1785 | + | |
| 2893 | 1786 | // Send the question to the server |
| 2894 | - sendMessageToChatbot(question, botId); | |
| 1787 | + sendMessageToChatbot(question); | |
| 2895 | 1788 | }); |
| 2896 | 1789 | |
| 2897 | 1790 | $(document).on('click', '.questions-toggle-btn', function(e) { |
| 2898 | 1791 | e.preventDefault(); |
| 2899 | 1792 | e.stopPropagation(); |
| 2900 | - var botId = getBotIdFromElement(this); | |
| 2901 | - expandQuickQuestions(botId); | |
| 1793 | + expandQuickQuestions(); | |
| 2902 | 1794 | }); |
| 2903 | 1795 | |
| 2904 | 1796 | $(document).on('click', '.questions-collapse-btn', function(e) { |
| 2905 | 1797 | e.preventDefault(); |
| 2906 | 1798 | e.stopPropagation(); |
| 2907 | - var botId = getBotIdFromElement(this); | |
| 2908 | - collapseQuickQuestions(botId); | |
| 1799 | + collapseQuickQuestions(); | |
| 2909 | 1800 | }); |
| 2910 | 1801 | |
| 2911 | - // Chatbot visibility toggle handlers - use class selector for multi-instance support | |
| 2912 | - $(document).on('click', '.floating-chatbot-button', function() { | |
| 2913 | - var botId = getBotIdFromElement(this); | |
| 2914 | - var $chatbot = getElement(botId, 'floating-chatbot'); | |
| 2915 | - var $badge = getElement(botId, 'chat-notification-badge'); | |
| 2916 | - var $preChat = getElement(botId, 'pre-chat-message'); | |
| 2917 | - | |
| 2918 | - if ($chatbot.hasClass('hidden')) { | |
| 2919 | - $chatbot.removeClass('hidden').addClass('visible'); | |
| 1802 | + // Chatbot visibility toggle handlers | |
| 1803 | + $(document).on('click', '#floating-chatbot-button', function() { | |
| 1804 | + var chatbot = $('#floating-chatbot'); | |
| 1805 | + if (chatbot.hasClass('hidden')) { | |
| 1806 | + chatbot.removeClass('hidden').addClass('visible'); | |
| 2920 | 1807 | $(this).addClass('hidden'); |
| 2921 | - $badge.hide(); // Hide notification when opening chat | |
| 1808 | + $('#chat-notification-badge').hide(); // Hide notification when opening chat | |
| 2922 | 1809 | disableScroll(); |
| 2923 | - $preChat.fadeOut(250); | |
| 2924 | - | |
| 2925 | - // Load chat history for returning visitors (persistence) | |
| 2926 | - var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on'; | |
| 2927 | - if (chatPersistenceEnabled) { | |
| 2928 | - MxChatInstances.ensureSession(botId); | |
| 2929 | - } | |
| 2930 | - | |
| 2931 | - // Deferred email check — only on first widget open | |
| 2932 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 2933 | - var instance = MxChatInstances.get(botId); | |
| 2934 | - if (emailBlocker && !instance.emailCheckDone) { | |
| 2935 | - instance.emailCheckDone = true; | |
| 2936 | - resolveEmailState(botId); | |
| 2937 | - } else if (!emailBlocker) { | |
| 2938 | - // No email collection — still route through showChatContainerForBot | |
| 2939 | - // so the loader is shown while chat history loads | |
| 2940 | - showChatContainerForBot(botId); | |
| 2941 | - } | |
| 1810 | + $('#pre-chat-message').fadeOut(250); | |
| 2942 | 1811 | } else { |
| 2943 | - $chatbot.removeClass('visible').addClass('hidden'); | |
| 1812 | + chatbot.removeClass('visible').addClass('hidden'); | |
| 2944 | 1813 | $(this).removeClass('hidden'); |
| 2945 | 1814 | enableScroll(); |
| 2946 | - checkPreChatDismissal(botId); | |
| 1815 | + checkPreChatDismissal(); | |
| 2947 | 1816 | } |
| 2948 | 1817 | }); |
| 2949 | - | |
| 2950 | - // Allow clicking anywhere on the title bar to close the chatbot | |
| 2951 | - $(document).on('click', '.chatbot-top-bar', function() { | |
| 2952 | - var botId = getBotIdFromElement(this); | |
| 2953 | - getElement(botId, 'floating-chatbot').addClass('hidden').removeClass('visible'); | |
| 2954 | - getElement(botId, 'floating-chatbot-button').removeClass('hidden'); | |
| 1818 | + | |
| 1819 | + $(document).on('click', '#exit-chat-button', function() { | |
| 1820 | + $('#floating-chatbot').addClass('hidden').removeClass('visible'); | |
| 1821 | + $('#floating-chatbot-button').removeClass('hidden'); | |
| 2955 | 1822 | enableScroll(); |
| 2956 | 1823 | }); |
| 2957 | - | |
| 1824 | + | |
| 2958 | 1825 | $(document).on('click', '.close-pre-chat-message', function(e) { |
| 2959 | 1826 | e.stopPropagation(); // Prevent triggering the parent .pre-chat-message click |
| 2960 | - var botId = getBotIdFromElement(this); | |
| 2961 | - handlePreChatDismissal(botId); | |
| 1827 | + $('#pre-chat-message').fadeOut(200, function() { | |
| 1828 | + $(this).remove(); | |
| 1829 | + }); | |
| 2962 | 1830 | }); |
| 1831 | + | |
| 2963 | 1832 | |
| 2964 | - | |
| 2965 | - // PDF upload button handlers - use class selector | |
| 2966 | - $(document).on('click', '.pdf-upload-btn', function() { | |
| 2967 | - var botId = getBotIdFromElement(this); | |
| 2968 | - var pdfInput = getElementDOM(botId, 'pdf-upload'); | |
| 2969 | - if (pdfInput) pdfInput.click(); | |
| 2970 | - }); | |
| 2971 | - | |
| 2972 | - // Word upload button handlers - use class selector | |
| 2973 | - $(document).on('click', '.word-upload-btn', function() { | |
| 2974 | - var botId = getBotIdFromElement(this); | |
| 2975 | - var wordInput = getElementDOM(botId, 'word-upload'); | |
| 2976 | - if (wordInput) wordInput.click(); | |
| 2977 | - }); | |
| 1833 | + // PDF upload button handlers | |
| 1834 | + if (document.getElementById('pdf-upload-btn')) { | |
| 1835 | + document.getElementById('pdf-upload-btn').addEventListener('click', function() { | |
| 1836 | + document.getElementById('pdf-upload').click(); | |
| 1837 | + }); | |
| 1838 | + } | |
| 2978 | 1839 | |
| 1840 | + // Word upload button handlers | |
| 1841 | + if (document.getElementById('word-upload-btn')) { | |
| 1842 | + document.getElementById('word-upload-btn').addEventListener('click', function() { | |
| 1843 | + document.getElementById('word-upload').click(); | |
| 1844 | + }); | |
| 1845 | + } | |
| 1846 | + | |
| 2979 | 1847 | // PDF file input change handler |
| 2980 | 1848 | addSafeEventListener('pdf-upload', 'change', async function(e) { |
| 2981 | 1849 | const file = e.target.files[0]; |
| 2982 | 1850 | |
| @@ -2985,13 +1853,15 @@ | ||
| 2985 | 1853 | return; |
| 2986 | 1854 | } |
| 2987 | 1855 | |
| 2988 | 1856 | if (!sessionId) { |
| 1857 | + //console.error('No session ID found'); | |
| 2989 | 1858 | alert('Error: No session ID found'); |
| 2990 | 1859 | return; |
| 2991 | 1860 | } |
| 2992 | - | |
| 1861 | + | |
| 2993 | 1862 | if (!mxchatChat || !mxchatChat.ajax_url || !mxchatChat.nonce) { |
| 1863 | + //console.error('mxchatChat not properly configured:', mxchatChat); | |
| 2994 | 1864 | alert('Error: Ajax configuration missing'); |
| 2995 | 1865 | return; |
| 2996 | 1866 | } |
| 2997 | 1867 | |
| @@ -3033,11 +1903,13 @@ | ||
| 3033 | 1903 | appendMessage('bot', data.data.message); |
| 3034 | 1904 | scrollToBottom(); |
| 3035 | 1905 | activePdfFile = data.data.filename; |
| 3036 | 1906 | } else { |
| 1907 | + //console.error('Upload failed:', data.data); | |
| 3037 | 1908 | alert('Failed to upload PDF. Please try again.'); |
| 3038 | 1909 | } |
| 3039 | 1910 | } catch (error) { |
| 1911 | + //console.error('Upload error:', error); | |
| 3040 | 1912 | alert('Error uploading file. Please try again.'); |
| 3041 | 1913 | } finally { |
| 3042 | 1914 | uploadBtn.disabled = false; |
| 3043 | 1915 | sendBtn.disabled = false; |
| @@ -3055,12 +1927,13 @@ | ||
| 3055 | 1927 | return; |
| 3056 | 1928 | } |
| 3057 | 1929 | |
| 3058 | 1930 | if (!sessionId) { |
| 1931 | + //console.error('No session ID found'); | |
| 3059 | 1932 | alert('Error: No session ID found'); |
| 3060 | 1933 | return; |
| 3061 | 1934 | } |
| 3062 | - | |
| 1935 | + | |
| 3063 | 1936 | // Disable buttons and show loading state |
| 3064 | 1937 | const uploadBtn = document.getElementById('word-upload-btn'); |
| 3065 | 1938 | const sendBtn = document.getElementById('send-button'); |
| 3066 | 1939 | const originalBtnContent = uploadBtn.innerHTML; |
| @@ -3098,11 +1971,13 @@ | ||
| 3098 | 1971 | appendMessage('bot', data.data.message); |
| 3099 | 1972 | scrollToBottom(); |
| 3100 | 1973 | activeWordFile = data.data.filename; |
| 3101 | 1974 | } else { |
| 1975 | + //console.error('Upload failed:', data.data); | |
| 3102 | 1976 | alert('Failed to upload Word document. Please try again.'); |
| 3103 | 1977 | } |
| 3104 | 1978 | } catch (error) { |
| 1979 | + //console.error('Upload error:', error); | |
| 3105 | 1980 | alert('Error uploading file. Please try again.'); |
| 3106 | 1981 | } finally { |
| 3107 | 1982 | uploadBtn.disabled = false; |
| 3108 | 1983 | sendBtn.disabled = false; |
| @@ -3160,185 +2035,167 @@ | ||
| 3160 | 2035 | }); |
| 3161 | 2036 | |
| 3162 | 2037 | |
| 3163 | 2038 | // ==================================== |
| 3164 | -// INIT LOADER & CHAT CONTAINER HELPERS | |
| 2039 | +// EMAIL COLLECTION SETUP | |
| 3165 | 2040 | // ==================================== |
| 3166 | -// These must be outside the email collection block so they're always available | |
| 3167 | -// (used by persistence loading even when email collection is off) | |
| 2041 | +// Email collection form setup and handlers | |
| 2042 | +const emailForm = document.getElementById('email-collection-form'); | |
| 2043 | +const emailBlocker = document.getElementById('email-blocker'); | |
| 2044 | +const chatbotWrapper = document.getElementById('chat-container'); | |
| 3168 | 2045 | |
| 3169 | -function showInitLoader(botId) { | |
| 3170 | - var loader = getElementDOM(botId, 'mxchat-init-loader'); | |
| 3171 | - if (loader) loader.style.display = 'flex'; | |
| 3172 | -} | |
| 3173 | - | |
| 3174 | -function hideInitLoader(botId) { | |
| 3175 | - var loader = getElementDOM(botId, 'mxchat-init-loader'); | |
| 3176 | - if (loader) loader.style.display = 'none'; | |
| 3177 | -} | |
| 3178 | - | |
| 3179 | -function showEmailFormForBot(botId) { | |
| 3180 | - hideInitLoader(botId); | |
| 3181 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 3182 | - var chatContainer = getElementDOM(botId, 'chat-container'); | |
| 3183 | - if (emailBlocker) emailBlocker.style.display = 'flex'; | |
| 3184 | - if (chatContainer) chatContainer.style.display = 'none'; | |
| 3185 | -} | |
| 3186 | - | |
| 3187 | -function showChatContainerForBot(botId) { | |
| 3188 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 3189 | - var chatContainer = getElementDOM(botId, 'chat-container'); | |
| 3190 | - if (emailBlocker) emailBlocker.style.display = 'none'; | |
| 3191 | - | |
| 3192 | - var instance = MxChatInstances.get(botId); | |
| 3193 | - var chatPersistenceEnabled = mxchatChat.chat_persistence_toggle === 'on'; | |
| 3194 | - | |
| 3195 | - // If persistence is on and history hasn't loaded yet, show loader | |
| 3196 | - // while history loads to prevent flash of empty chat | |
| 3197 | - if (chatPersistenceEnabled && !instance.chatHistoryLoaded) { | |
| 3198 | - if (chatContainer) chatContainer.style.display = 'none'; | |
| 3199 | - showInitLoader(botId); | |
| 3200 | - loadChatHistory(botId, function() { | |
| 3201 | - hideInitLoader(botId); | |
| 3202 | - if (chatContainer) chatContainer.style.display = 'flex'; | |
| 3203 | - scrollToBottom(botId, true); | |
| 3204 | - }); | |
| 2046 | +if (emailForm && emailBlocker && chatbotWrapper) { | |
| 2047 | + | |
| 2048 | + // NEW: Check if server already provided the email state | |
| 2049 | + if (mxchatChat.skip_email_check && mxchatChat.initial_email_state) { | |
| 2050 | + console.log('Using server-provided email state:', mxchatChat.initial_email_state); | |
| 2051 | + | |
| 2052 | + // Use server-provided state instead of making AJAX call | |
| 2053 | + const emailState = mxchatChat.initial_email_state; | |
| 2054 | + if (emailState.show_email_form) { | |
| 2055 | + showEmailForm(); | |
| 2056 | + } else { | |
| 2057 | + showChatContainer(); | |
| 2058 | + } | |
| 2059 | + | |
| 2060 | + // Continue to set up form handlers but skip the AJAX check | |
| 2061 | + setupFormHandlers(); | |
| 2062 | + | |
| 3205 | 2063 | } else { |
| 3206 | - hideInitLoader(botId); | |
| 3207 | - if (chatContainer) chatContainer.style.display = 'flex'; | |
| 3208 | - if (typeof loadChatHistory === 'function') { | |
| 3209 | - loadChatHistory(botId); | |
| 3210 | - } | |
| 2064 | + // FALLBACK: Use existing AJAX approach if server state not available | |
| 2065 | + console.log('Server state not available, using AJAX fallback'); | |
| 2066 | + setupFormHandlers(); | |
| 2067 | + // Initialize email check with delay to prevent race conditions | |
| 2068 | + setTimeout(checkSessionAndEmail, 100); | |
| 3211 | 2069 | } |
| 3212 | -} | |
| 3213 | 2070 | |
| 3214 | -// ==================================== | |
| 3215 | -// EMAIL COLLECTION SETUP - MULTI-INSTANCE VERSION | |
| 3216 | -// ==================================== | |
| 3217 | -// Only run email collection setup if it's enabled | |
| 3218 | -if (mxchatChat && mxchatChat.email_collection_enabled === 'on') { | |
| 3219 | - | |
| 3220 | - // Track submitting state per bot | |
| 3221 | - const emailSubmittingState = {}; | |
| 3222 | - | |
| 3223 | - // Add CSS animations for email form (once globally) | |
| 3224 | - if (!document.getElementById('email-error-styles')) { | |
| 3225 | - const style = document.createElement('style'); | |
| 3226 | - style.id = 'email-error-styles'; | |
| 3227 | - style.textContent = ` | |
| 3228 | - @keyframes fadeInError { | |
| 3229 | - from { opacity: 0; transform: translateY(-5px); } | |
| 3230 | - to { opacity: 1; transform: translateY(0); } | |
| 2071 | + // Add loading state management | |
| 2072 | + let isSubmitting = false; | |
| 2073 | + | |
| 2074 | + // Check if email exists for the current session | |
| 2075 | + function checkSessionAndEmail() { | |
| 2076 | + const sessionId = getChatSession(); | |
| 2077 | + | |
| 2078 | + // Add timeout to prevent hanging | |
| 2079 | + const controller = new AbortController(); | |
| 2080 | + const timeoutId = setTimeout(() => controller.abort(), 10000); // 10 second timeout | |
| 2081 | + | |
| 2082 | + fetch(mxchatChat.ajax_url, { | |
| 2083 | + method: 'POST', | |
| 2084 | + headers: { | |
| 2085 | + 'Content-Type': 'application/x-www-form-urlencoded', | |
| 2086 | + }, | |
| 2087 | + body: new URLSearchParams({ | |
| 2088 | + action: 'mxchat_check_email_provided', | |
| 2089 | + session_id: sessionId, | |
| 2090 | + nonce: mxchatChat.nonce, | |
| 2091 | + }), | |
| 2092 | + signal: controller.signal | |
| 2093 | + }) | |
| 2094 | + .then((response) => { | |
| 2095 | + clearTimeout(timeoutId); | |
| 2096 | + if (!response.ok) { | |
| 2097 | + throw new Error(`HTTP error! status: ${response.status}`); | |
| 3231 | 2098 | } |
| 3232 | - .email-input-shake { | |
| 3233 | - animation: shake 0.5s ease-in-out; | |
| 2099 | + return response.json(); | |
| 2100 | + }) | |
| 2101 | + .then((data) => { | |
| 2102 | + if (data.success) { | |
| 2103 | + if (data.data.logged_in || data.data.email) { | |
| 2104 | + showChatContainer(); | |
| 2105 | + } else { | |
| 2106 | + showEmailForm(); | |
| 2107 | + } | |
| 2108 | + } else { | |
| 2109 | + // On error, default to showing email form | |
| 2110 | + showEmailForm(); | |
| 3234 | 2111 | } |
| 3235 | - @keyframes shake { | |
| 3236 | - 0%, 100% { transform: translateX(0); } | |
| 3237 | - 25% { transform: translateX(-5px); } | |
| 3238 | - 75% { transform: translateX(5px); } | |
| 3239 | - } | |
| 3240 | - @keyframes spin { | |
| 3241 | - from { transform: rotate(0deg); } | |
| 3242 | - to { transform: rotate(360deg); } | |
| 3243 | - } | |
| 3244 | - .email-spinner { | |
| 3245 | - display: inline-block; | |
| 3246 | - vertical-align: middle; | |
| 3247 | - } | |
| 3248 | - `; | |
| 3249 | - document.head.appendChild(style); | |
| 2112 | + }) | |
| 2113 | + .catch((error) => { | |
| 2114 | + clearTimeout(timeoutId); | |
| 2115 | + console.warn('Email check failed, defaulting to email form:', error); | |
| 2116 | + showEmailForm(); | |
| 2117 | + }); | |
| 3250 | 2118 | } |
| 3251 | 2119 | |
| 3252 | - function isValidEmailAddress(email) { | |
| 3253 | - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; | |
| 3254 | - return emailRegex.test(email.trim()) && email.length <= 254; | |
| 2120 | + // Optimized UI transition functions | |
| 2121 | + function showEmailForm() { | |
| 2122 | + emailBlocker.style.display = 'flex'; | |
| 2123 | + chatbotWrapper.style.display = 'none'; | |
| 3255 | 2124 | } |
| 3256 | 2125 | |
| 3257 | - function isValidNameInput(name) { | |
| 3258 | - return name && name.trim().length >= 2 && name.trim().length <= 100; | |
| 2126 | + function showChatContainer() { | |
| 2127 | + // Show chat immediately without delay | |
| 2128 | + emailBlocker.style.display = 'none'; | |
| 2129 | + chatbotWrapper.style.display = 'flex'; | |
| 2130 | + | |
| 2131 | + // Load chat history only after showing chat container | |
| 2132 | + if (typeof loadChatHistory === 'function') { | |
| 2133 | + loadChatHistory(); | |
| 2134 | + } | |
| 3259 | 2135 | } |
| 3260 | 2136 | |
| 3261 | - /** | |
| 3262 | - * Replace {visitor_name} placeholder in intro message with actual visitor name | |
| 3263 | - * @param {string} botId - The bot instance ID | |
| 3264 | - * @param {string} visitorName - The visitor's name to insert | |
| 3265 | - */ | |
| 3266 | - function replaceVisitorNamePlaceholder(botId, visitorName) { | |
| 3267 | - var chatBox = getElementDOM(botId, 'chat-box'); | |
| 3268 | - if (!chatBox) return; | |
| 2137 | + // Enhanced email validation | |
| 2138 | + function isValidEmail(email) { | |
| 2139 | + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; | |
| 2140 | + return emailRegex.test(email.trim()) && email.length <= 254; // RFC 5321 limit | |
| 2141 | + } | |
| 3269 | 2142 | |
| 3270 | - // Find the first bot message (intro message) | |
| 3271 | - var introMessage = chatBox.querySelector('.bot-message'); | |
| 3272 | - if (!introMessage) return; | |
| 3273 | - | |
| 3274 | - var messageContent = introMessage.querySelector('div[dir="auto"]'); | |
| 3275 | - if (!messageContent) return; | |
| 3276 | - | |
| 3277 | - var html = messageContent.innerHTML; | |
| 3278 | - | |
| 3279 | - // Replace {visitor_name} placeholder (case-insensitive) | |
| 3280 | - if (visitorName && visitorName.trim()) { | |
| 3281 | - // Escape HTML to prevent XSS | |
| 3282 | - var safeName = $('<div>').text(visitorName.trim()).html(); | |
| 3283 | - html = html.replace(/\{visitor_name\}/gi, safeName); | |
| 3284 | - } else { | |
| 3285 | - // Remove placeholder and clean up spacing if no name provided | |
| 3286 | - html = html.replace(/\{visitor_name\}/gi, ''); | |
| 3287 | - // Clean up any double spaces that might result | |
| 3288 | - html = html.replace(/\s{2,}/g, ' ').trim(); | |
| 3289 | - } | |
| 3290 | - | |
| 3291 | - messageContent.innerHTML = html; | |
| 2143 | + // Enhanced name validation | |
| 2144 | + function isValidName(name) { | |
| 2145 | + return name && name.trim().length >= 2 && name.trim().length <= 100; | |
| 3292 | 2146 | } |
| 3293 | 2147 | |
| 3294 | - function setEmailSubmissionState(botId, loading) { | |
| 3295 | - var submitButton = getElementDOM(botId, 'email-submit-button'); | |
| 3296 | - var emailInput = getElementDOM(botId, 'user-email'); | |
| 3297 | - var nameInput = getElementDOM(botId, 'user-name'); | |
| 3298 | - | |
| 2148 | + // Show loading state with spinner | |
| 2149 | + function setSubmissionState(loading) { | |
| 2150 | + const submitButton = document.getElementById('email-submit-button'); | |
| 2151 | + const emailInput = document.getElementById('user-email'); | |
| 2152 | + const nameInput = document.getElementById('user-name'); | |
| 2153 | + | |
| 3299 | 2154 | if (loading) { |
| 3300 | - emailSubmittingState[botId] = true; | |
| 3301 | - if (submitButton) submitButton.disabled = true; | |
| 3302 | - if (emailInput) emailInput.disabled = true; | |
| 2155 | + isSubmitting = true; | |
| 2156 | + submitButton.disabled = true; | |
| 2157 | + emailInput.disabled = true; | |
| 3303 | 2158 | if (nameInput) nameInput.disabled = true; |
| 3304 | - | |
| 3305 | - if (submitButton && !submitButton.getAttribute('data-original-html')) { | |
| 2159 | + | |
| 2160 | + // Store original content and add spinner | |
| 2161 | + if (!submitButton.getAttribute('data-original-html')) { | |
| 3306 | 2162 | submitButton.setAttribute('data-original-html', submitButton.innerHTML); |
| 3307 | - const originalText = submitButton.textContent; | |
| 3308 | - submitButton.innerHTML = ` | |
| 3309 | - <svg class="email-spinner" style="width: 16px; height: 16px; margin-right: 8px; animation: spin 1s linear infinite;" viewBox="0 0 24 24"> | |
| 3310 | - <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" fill="none" stroke-dasharray="31.416" stroke-dashoffset="31.416"> | |
| 3311 | - <animate attributeName="stroke-dasharray" dur="2s" values="0 31.416;15.708 15.708;0 31.416" repeatCount="indefinite"/> | |
| 3312 | - <animate attributeName="stroke-dashoffset" dur="2s" values="0;-15.708;-31.416" repeatCount="indefinite"/> | |
| 3313 | - </circle> | |
| 3314 | - </svg> | |
| 3315 | - ${originalText} | |
| 3316 | - `; | |
| 3317 | - submitButton.style.opacity = '0.8'; | |
| 3318 | 2163 | } |
| 2164 | + | |
| 2165 | + // Add loading spinner while keeping original text | |
| 2166 | + const originalText = submitButton.textContent; | |
| 2167 | + submitButton.innerHTML = ` | |
| 2168 | + <svg class="email-spinner" style="width: 16px; height: 16px; margin-right: 8px; animation: spin 1s linear infinite;" viewBox="0 0 24 24"> | |
| 2169 | + <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" fill="none" stroke-dasharray="31.416" stroke-dashoffset="31.416"> | |
| 2170 | + <animate attributeName="stroke-dasharray" dur="2s" values="0 31.416;15.708 15.708;0 31.416" repeatCount="indefinite"/> | |
| 2171 | + <animate attributeName="stroke-dashoffset" dur="2s" values="0;-15.708;-31.416" repeatCount="indefinite"/> | |
| 2172 | + </circle> | |
| 2173 | + </svg> | |
| 2174 | + ${originalText} | |
| 2175 | + `; | |
| 2176 | + | |
| 2177 | + submitButton.style.opacity = '0.8'; | |
| 3319 | 2178 | } else { |
| 3320 | - emailSubmittingState[botId] = false; | |
| 3321 | - if (submitButton) submitButton.disabled = false; | |
| 3322 | - if (emailInput) emailInput.disabled = false; | |
| 2179 | + isSubmitting = false; | |
| 2180 | + submitButton.disabled = false; | |
| 2181 | + emailInput.disabled = false; | |
| 3323 | 2182 | if (nameInput) nameInput.disabled = false; |
| 3324 | - | |
| 3325 | - if (submitButton) { | |
| 3326 | - const originalHtml = submitButton.getAttribute('data-original-html'); | |
| 3327 | - if (originalHtml) { | |
| 3328 | - submitButton.innerHTML = originalHtml; | |
| 3329 | - } | |
| 3330 | - submitButton.style.opacity = '1'; | |
| 2183 | + | |
| 2184 | + // Restore original content | |
| 2185 | + const originalHtml = submitButton.getAttribute('data-original-html'); | |
| 2186 | + if (originalHtml) { | |
| 2187 | + submitButton.innerHTML = originalHtml; | |
| 3331 | 2188 | } |
| 2189 | + | |
| 2190 | + submitButton.style.opacity = '1'; | |
| 3332 | 2191 | } |
| 3333 | 2192 | } |
| 3334 | 2193 | |
| 3335 | - function showEmailError(botId, message) { | |
| 3336 | - clearEmailError(botId); | |
| 3337 | - | |
| 3338 | - var emailForm = getElementDOM(botId, 'email-collection-form'); | |
| 3339 | - if (!emailForm) return; | |
| 3340 | - | |
| 2194 | + // Error display functions | |
| 2195 | + function showEmailError(message) { | |
| 2196 | + clearEmailError(); | |
| 2197 | + | |
| 3341 | 2198 | const errorDiv = document.createElement('div'); |
| 3342 | 2199 | errorDiv.className = 'email-error'; |
| 3343 | 2200 | errorDiv.style.cssText = ` |
| 3344 | 2201 | color: #e74c3c; |
| @@ -3347,310 +2204,300 @@ | ||
| 3347 | 2204 | padding: 4px 0; |
| 3348 | 2205 | animation: fadeInError 0.3s ease; |
| 3349 | 2206 | `; |
| 3350 | 2207 | errorDiv.textContent = message; |
| 2208 | + | |
| 2209 | + // Add CSS animation if not already present | |
| 2210 | + if (!document.getElementById('email-error-styles')) { | |
| 2211 | + const style = document.createElement('style'); | |
| 2212 | + style.id = 'email-error-styles'; | |
| 2213 | + style.textContent = ` | |
| 2214 | + @keyframes fadeInError { | |
| 2215 | + from { opacity: 0; transform: translateY(-5px); } | |
| 2216 | + to { opacity: 1; transform: translateY(0); } | |
| 2217 | + } | |
| 2218 | + .email-input-shake { | |
| 2219 | + animation: shake 0.5s ease-in-out; | |
| 2220 | + } | |
| 2221 | + @keyframes shake { | |
| 2222 | + 0%, 100% { transform: translateX(0); } | |
| 2223 | + 25% { transform: translateX(-5px); } | |
| 2224 | + 75% { transform: translateX(5px); } | |
| 2225 | + } | |
| 2226 | + `; | |
| 2227 | + document.head.appendChild(style); | |
| 2228 | + } | |
| 2229 | + | |
| 3351 | 2230 | emailForm.appendChild(errorDiv); |
| 3352 | - | |
| 2231 | + | |
| 3353 | 2232 | // Add shake animation to inputs |
| 3354 | - var emailInput = getElementDOM(botId, 'user-email'); | |
| 3355 | - var nameInput = getElementDOM(botId, 'user-name'); | |
| 3356 | - | |
| 2233 | + const emailInput = document.getElementById('user-email'); | |
| 2234 | + const nameInput = document.getElementById('user-name'); | |
| 2235 | + | |
| 3357 | 2236 | if (emailInput) { |
| 3358 | 2237 | emailInput.classList.add('email-input-shake'); |
| 3359 | - setTimeout(() => emailInput.classList.remove('email-input-shake'), 500); | |
| 2238 | + setTimeout(() => { | |
| 2239 | + emailInput.classList.remove('email-input-shake'); | |
| 2240 | + }, 500); | |
| 3360 | 2241 | } |
| 2242 | + | |
| 3361 | 2243 | if (nameInput) { |
| 3362 | 2244 | nameInput.classList.add('email-input-shake'); |
| 3363 | - setTimeout(() => nameInput.classList.remove('email-input-shake'), 500); | |
| 2245 | + setTimeout(() => { | |
| 2246 | + nameInput.classList.remove('email-input-shake'); | |
| 2247 | + }, 500); | |
| 3364 | 2248 | } |
| 3365 | 2249 | } |
| 3366 | 2250 | |
| 3367 | - function clearEmailError(botId) { | |
| 3368 | - var emailForm = getElementDOM(botId, 'email-collection-form'); | |
| 3369 | - if (emailForm) { | |
| 3370 | - const existingErrors = emailForm.querySelectorAll('.email-error'); | |
| 3371 | - existingErrors.forEach(error => error.remove()); | |
| 3372 | - } | |
| 2251 | + function clearEmailError() { | |
| 2252 | + const existingErrors = emailForm.querySelectorAll('.email-error'); | |
| 2253 | + existingErrors.forEach(error => error.remove()); | |
| 3373 | 2254 | } |
| 3374 | 2255 | |
| 3375 | - // Resolve email state using server-side data when available, AJAX fallback otherwise | |
| 3376 | - function resolveEmailState(botId) { | |
| 3377 | - if (mxchatChat.skip_email_check && mxchatChat.initial_email_state) { | |
| 3378 | - if (mxchatChat.initial_email_state.show_email_form) { | |
| 3379 | - showEmailFormForBot(botId); | |
| 3380 | - } else { | |
| 3381 | - showChatContainerForBot(botId); | |
| 3382 | - } | |
| 3383 | - } else { | |
| 3384 | - checkSessionAndEmailForBot(botId); | |
| 2256 | + // NEW: Separate function to set up all form handlers | |
| 2257 | + function setupFormHandlers() { | |
| 2258 | + // Add CSS for spinner animation if not already present | |
| 2259 | + if (!document.getElementById('email-spinner-styles')) { | |
| 2260 | + const style = document.createElement('style'); | |
| 2261 | + style.id = 'email-spinner-styles'; | |
| 2262 | + style.textContent = ` | |
| 2263 | + @keyframes spin { | |
| 2264 | + from { transform: rotate(0deg); } | |
| 2265 | + to { transform: rotate(360deg); } | |
| 2266 | + } | |
| 2267 | + .email-spinner { | |
| 2268 | + display: inline-block; | |
| 2269 | + vertical-align: middle; | |
| 2270 | + } | |
| 2271 | + `; | |
| 2272 | + document.head.appendChild(style); | |
| 3385 | 2273 | } |
| 3386 | - } | |
| 3387 | 2274 | |
| 3388 | - function checkSessionAndEmailForBot(botId) { | |
| 3389 | - const sessionId = MxChatInstances.ensureSession(botId); | |
| 2275 | + // Handle email form submission with improved error handling | |
| 2276 | + emailForm.addEventListener('submit', function (event) { | |
| 2277 | + event.preventDefault(); | |
| 2278 | + | |
| 2279 | + // Prevent double submission | |
| 2280 | + if (isSubmitting) { | |
| 2281 | + return; | |
| 2282 | + } | |
| 3390 | 2283 | |
| 3391 | - // Hide both panels while we check — show loader instead | |
| 3392 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 3393 | - var chatContainer = getElementDOM(botId, 'chat-container'); | |
| 3394 | - if (emailBlocker) emailBlocker.style.display = 'none'; | |
| 3395 | - if (chatContainer) chatContainer.style.display = 'none'; | |
| 3396 | - showInitLoader(botId); | |
| 2284 | + const userEmail = document.getElementById('user-email').value.trim(); | |
| 2285 | + const nameInput = document.getElementById('user-name'); | |
| 2286 | + const userName = nameInput ? nameInput.value.trim() : ''; | |
| 2287 | + const sessionId = getChatSession(); | |
| 3397 | 2288 | |
| 3398 | - fetch(mxchatChat.ajax_url, { | |
| 3399 | - method: 'POST', | |
| 3400 | - headers: { | |
| 3401 | - 'Content-Type': 'application/x-www-form-urlencoded', | |
| 3402 | - }, | |
| 3403 | - body: new URLSearchParams({ | |
| 3404 | - action: 'mxchat_check_email_provided', | |
| 3405 | - session_id: sessionId, | |
| 3406 | - nonce: mxchatChat.nonce, | |
| 3407 | - }) | |
| 3408 | - }) | |
| 3409 | - .then((response) => { | |
| 3410 | - if (!response.ok) { | |
| 3411 | - throw new Error(`HTTP error! status: ${response.status}`); | |
| 2289 | + // Validate email before submission | |
| 2290 | + if (!userEmail) { | |
| 2291 | + showEmailError('Please enter your email address.'); | |
| 2292 | + return; | |
| 3412 | 2293 | } |
| 3413 | - return response.json(); | |
| 3414 | - }) | |
| 3415 | - .then((data) => { | |
| 3416 | - if (data.success) { | |
| 3417 | - if (data.data.logged_in || data.data.email) { | |
| 3418 | - showChatContainerForBot(botId); | |
| 3419 | - } else { | |
| 3420 | - showEmailFormForBot(botId); | |
| 3421 | - } | |
| 3422 | - } else { | |
| 3423 | - showEmailFormForBot(botId); | |
| 2294 | + | |
| 2295 | + if (!isValidEmail(userEmail)) { | |
| 2296 | + showEmailError('Please enter a valid email address.'); | |
| 2297 | + return; | |
| 3424 | 2298 | } |
| 3425 | - }) | |
| 3426 | - .catch((error) => { | |
| 3427 | - showEmailFormForBot(botId); | |
| 3428 | - }); | |
| 3429 | - } | |
| 3430 | 2299 | |
| 3431 | - // Event delegation for email form submission | |
| 3432 | - $(document).on('submit', '.email-collection-form', function(e) { | |
| 3433 | - e.preventDefault(); | |
| 3434 | - e.stopPropagation(); | |
| 2300 | + // Validate name if field exists | |
| 2301 | + if (nameInput && !isValidName(userName)) { | |
| 2302 | + showEmailError('Please enter a valid name (2-100 characters).'); | |
| 2303 | + return; | |
| 2304 | + } | |
| 3435 | 2305 | |
| 3436 | - var botId = getBotIdFromElement(this); | |
| 2306 | + // Clear any existing errors | |
| 2307 | + clearEmailError(); | |
| 2308 | + setSubmissionState(true); | |
| 3437 | 2309 | |
| 3438 | - // Prevent double submission | |
| 3439 | - if (emailSubmittingState[botId]) { | |
| 3440 | - return false; | |
| 3441 | - } | |
| 2310 | + // Add timeout for submission | |
| 2311 | + const controller = new AbortController(); | |
| 2312 | + const timeoutId = setTimeout(() => { | |
| 2313 | + controller.abort(); | |
| 2314 | + setSubmissionState(false); | |
| 2315 | + showEmailError('Request timed out. Please try again.'); | |
| 2316 | + }, 15000); // 15 second timeout | |
| 3442 | 2317 | |
| 3443 | - var emailInput = getElementDOM(botId, 'user-email'); | |
| 3444 | - var nameInput = getElementDOM(botId, 'user-name'); | |
| 3445 | - var userEmail = emailInput ? emailInput.value.trim() : ''; | |
| 3446 | - var userName = nameInput ? nameInput.value.trim() : ''; | |
| 3447 | - var sessionId = MxChatInstances.ensureSession(botId); | |
| 2318 | + // Prepare form data with optional name | |
| 2319 | + const formData = new URLSearchParams({ | |
| 2320 | + action: 'mxchat_handle_save_email_and_response', | |
| 2321 | + email: userEmail, | |
| 2322 | + session_id: sessionId, | |
| 2323 | + nonce: mxchatChat.nonce, | |
| 2324 | + }); | |
| 3448 | 2325 | |
| 3449 | - // Validate email | |
| 3450 | - if (!userEmail) { | |
| 3451 | - showEmailError(botId, 'Please enter your email address.'); | |
| 3452 | - return false; | |
| 3453 | - } | |
| 3454 | - | |
| 3455 | - if (!isValidEmailAddress(userEmail)) { | |
| 3456 | - showEmailError(botId, 'Please enter a valid email address.'); | |
| 3457 | - return false; | |
| 3458 | - } | |
| 3459 | - | |
| 3460 | - // Validate name if field exists and has content | |
| 3461 | - if (nameInput && userName && !isValidNameInput(userName)) { | |
| 3462 | - showEmailError(botId, 'Please enter a valid name (2-100 characters).'); | |
| 3463 | - return false; | |
| 3464 | - } | |
| 3465 | - | |
| 3466 | - clearEmailError(botId); | |
| 3467 | - setEmailSubmissionState(botId, true); | |
| 3468 | - | |
| 3469 | - // Prepare form data | |
| 3470 | - const formData = new URLSearchParams({ | |
| 3471 | - action: 'mxchat_handle_save_email_and_response', | |
| 3472 | - email: userEmail, | |
| 3473 | - session_id: sessionId, | |
| 3474 | - nonce: mxchatChat.nonce, | |
| 3475 | - }); | |
| 3476 | - | |
| 3477 | - if (userName) { | |
| 3478 | - formData.append('name', userName); | |
| 3479 | - } | |
| 3480 | - | |
| 3481 | - fetch(mxchatChat.ajax_url, { | |
| 3482 | - method: 'POST', | |
| 3483 | - headers: { | |
| 3484 | - 'Content-Type': 'application/x-www-form-urlencoded', | |
| 3485 | - }, | |
| 3486 | - body: formData | |
| 3487 | - }) | |
| 3488 | - .then((response) => { | |
| 3489 | - if (!response.ok) { | |
| 3490 | - throw new Error(`HTTP error! status: ${response.status}`); | |
| 2326 | + // Add name to form data if provided | |
| 2327 | + if (userName) { | |
| 2328 | + formData.append('name', userName); | |
| 3491 | 2329 | } |
| 3492 | - return response.json(); | |
| 3493 | - }) | |
| 3494 | - .then((data) => { | |
| 3495 | - setEmailSubmissionState(botId, false); | |
| 3496 | 2330 | |
| 3497 | - if (data.success) { | |
| 3498 | - showChatContainerForBot(botId); | |
| 2331 | + fetch(mxchatChat.ajax_url, { | |
| 2332 | + method: 'POST', | |
| 2333 | + headers: { | |
| 2334 | + 'Content-Type': 'application/x-www-form-urlencoded', | |
| 2335 | + }, | |
| 2336 | + body: formData, | |
| 2337 | + signal: controller.signal | |
| 2338 | + }) | |
| 2339 | + .then((response) => { | |
| 2340 | + clearTimeout(timeoutId); | |
| 2341 | + if (!response.ok) { | |
| 2342 | + throw new Error(`HTTP error! status: ${response.status}`); | |
| 2343 | + } | |
| 2344 | + return response.json(); | |
| 2345 | + }) | |
| 2346 | + .then((data) => { | |
| 2347 | + setSubmissionState(false); | |
| 2348 | + | |
| 2349 | + if (data.success) { | |
| 2350 | + // Show chat immediately | |
| 2351 | + showChatContainer(); | |
| 3499 | 2352 | |
| 3500 | - // Replace {visitor_name} placeholder in intro message with actual name | |
| 3501 | - if (userName) { | |
| 3502 | - replaceVisitorNamePlaceholder(botId, userName); | |
| 2353 | + // Handle bot response if provided | |
| 2354 | + if (data.message && typeof appendMessage === 'function') { | |
| 2355 | + setTimeout(() => { | |
| 2356 | + appendMessage('bot', data.message); | |
| 2357 | + if (typeof scrollToBottom === 'function') { | |
| 2358 | + scrollToBottom(); | |
| 2359 | + } | |
| 2360 | + }, 100); | |
| 2361 | + } | |
| 3503 | 2362 | } else { |
| 3504 | - // Remove placeholder if no name provided | |
| 3505 | - replaceVisitorNamePlaceholder(botId, ''); | |
| 2363 | + showEmailError(data.message || 'Failed to save email. Please try again.'); | |
| 3506 | 2364 | } |
| 3507 | - | |
| 3508 | - if (data.message && typeof appendMessage === 'function') { | |
| 3509 | - setTimeout(() => { | |
| 3510 | - appendMessage('bot', data.message, '', [], false, botId); | |
| 3511 | - if (typeof scrollToBottom === 'function') { | |
| 3512 | - scrollToBottom(botId); | |
| 3513 | - } | |
| 3514 | - }, 100); | |
| 2365 | + }) | |
| 2366 | + .catch((error) => { | |
| 2367 | + clearTimeout(timeoutId); | |
| 2368 | + setSubmissionState(false); | |
| 2369 | + | |
| 2370 | + if (error.name === 'AbortError') { | |
| 2371 | + showEmailError('Request timed out. Please try again.'); | |
| 2372 | + } else { | |
| 2373 | + console.error('Email submission error:', error); | |
| 2374 | + showEmailError('An error occurred. Please try again.'); | |
| 3515 | 2375 | } |
| 3516 | - } else { | |
| 3517 | - showEmailError(botId, data.message || 'Failed to save email. Please try again.'); | |
| 3518 | - } | |
| 3519 | - }) | |
| 3520 | - .catch((error) => { | |
| 3521 | - setEmailSubmissionState(botId, false); | |
| 3522 | - showEmailError(botId, 'An error occurred. Please try again.'); | |
| 2376 | + }); | |
| 3523 | 2377 | }); |
| 3524 | 2378 | |
| 3525 | - return false; | |
| 3526 | - }); | |
| 2379 | + // Real-time email validation | |
| 2380 | + const emailInput = document.getElementById('user-email'); | |
| 2381 | + if (emailInput) { | |
| 2382 | + let validationTimeout; | |
| 2383 | + | |
| 2384 | + emailInput.addEventListener('input', function() { | |
| 2385 | + // Clear previous validation timeout | |
| 2386 | + if (validationTimeout) { | |
| 2387 | + clearTimeout(validationTimeout); | |
| 2388 | + } | |
| 2389 | + | |
| 2390 | + // Debounce validation | |
| 2391 | + validationTimeout = setTimeout(() => { | |
| 2392 | + const email = this.value.trim(); | |
| 2393 | + clearEmailError(); | |
| 2394 | + | |
| 2395 | + if (email && !isValidEmail(email)) { | |
| 2396 | + showEmailError('Please enter a valid email address.'); | |
| 2397 | + } | |
| 2398 | + }, 500); | |
| 2399 | + }); | |
| 3527 | 2400 | |
| 3528 | - // Real-time email validation using event delegation | |
| 3529 | - $(document).on('input', '.mxchat-email-input', function() { | |
| 3530 | - var botId = getBotIdFromElement(this); | |
| 3531 | - var $input = $(this); | |
| 3532 | - | |
| 3533 | - // Clear previous timeout | |
| 3534 | - clearTimeout($input.data('validationTimeout')); | |
| 3535 | - | |
| 3536 | - // Debounce validation | |
| 3537 | - var timeout = setTimeout(() => { | |
| 3538 | - var email = this.value.trim(); | |
| 3539 | - clearEmailError(botId); | |
| 3540 | - | |
| 3541 | - if (email && !isValidEmailAddress(email)) { | |
| 3542 | - showEmailError(botId, 'Please enter a valid email address.'); | |
| 3543 | - } | |
| 3544 | - }, 500); | |
| 3545 | - | |
| 3546 | - $input.data('validationTimeout', timeout); | |
| 3547 | - }); | |
| 3548 | - | |
| 3549 | - // Handle Enter key in email input | |
| 3550 | - $(document).on('keypress', '.mxchat-email-input', function(e) { | |
| 3551 | - if (e.key === 'Enter') { | |
| 3552 | - e.preventDefault(); | |
| 3553 | - var botId = getBotIdFromElement(this); | |
| 3554 | - if (!emailSubmittingState[botId]) { | |
| 3555 | - $(this).closest('.email-collection-form').submit(); | |
| 3556 | - } | |
| 2401 | + // Handle Enter key | |
| 2402 | + emailInput.addEventListener('keypress', function(e) { | |
| 2403 | + if (e.key === 'Enter' && !isSubmitting) { | |
| 2404 | + emailForm.dispatchEvent(new Event('submit')); | |
| 2405 | + } | |
| 2406 | + }); | |
| 3557 | 2407 | } |
| 3558 | - }); | |
| 3559 | 2408 | |
| 3560 | - // Handle Enter key in name input | |
| 3561 | - $(document).on('keypress', '.mxchat-name-input', function(e) { | |
| 3562 | - if (e.key === 'Enter') { | |
| 3563 | - e.preventDefault(); | |
| 3564 | - var botId = getBotIdFromElement(this); | |
| 3565 | - if (!emailSubmittingState[botId]) { | |
| 3566 | - $(this).closest('.email-collection-form').submit(); | |
| 3567 | - } | |
| 3568 | - } | |
| 3569 | - }); | |
| 2409 | + // Real-time name validation | |
| 2410 | + const nameInput = document.getElementById('user-name'); | |
| 2411 | + if (nameInput) { | |
| 2412 | + let nameValidationTimeout; | |
| 2413 | + | |
| 2414 | + nameInput.addEventListener('input', function() { | |
| 2415 | + // Clear previous validation timeout | |
| 2416 | + if (nameValidationTimeout) { | |
| 2417 | + clearTimeout(nameValidationTimeout); | |
| 2418 | + } | |
| 2419 | + | |
| 2420 | + // Debounce validation | |
| 2421 | + nameValidationTimeout = setTimeout(() => { | |
| 2422 | + const name = this.value.trim(); | |
| 2423 | + clearEmailError(); | |
| 2424 | + | |
| 2425 | + if (name && !isValidName(name)) { | |
| 2426 | + showEmailError('Name must be between 2 and 100 characters.'); | |
| 2427 | + } | |
| 2428 | + }, 500); | |
| 2429 | + }); | |
| 3570 | 2430 | |
| 3571 | - // Initialize email check for all bot instances | |
| 3572 | - // For floating bots: defer until widget is opened (zero passive AJAX) | |
| 3573 | - // For embedded bots: check immediately since the form is visible | |
| 3574 | - $('.mxchat-chatbot-wrapper').each(function() { | |
| 3575 | - var botId = $(this).data('bot-id') || 'default'; | |
| 3576 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 3577 | - | |
| 3578 | - if (emailBlocker) { | |
| 3579 | - if (isEmbeddedBot(botId)) { | |
| 3580 | - // Embedded bots are always visible — check now | |
| 3581 | - resolveEmailState(botId); | |
| 3582 | - } | |
| 3583 | - // Floating bots: handled in the widget open handler | |
| 3584 | - } else if (isEmbeddedBot(botId)) { | |
| 3585 | - // Embedded bot, no email collection — load history with loader | |
| 3586 | - var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on'; | |
| 3587 | - if (chatPersistenceEnabled) { | |
| 3588 | - MxChatInstances.ensureSession(botId); | |
| 3589 | - showChatContainerForBot(botId); | |
| 3590 | - } | |
| 2431 | + // Handle Enter key | |
| 2432 | + nameInput.addEventListener('keypress', function(e) { | |
| 2433 | + if (e.key === 'Enter' && !isSubmitting) { | |
| 2434 | + emailForm.dispatchEvent(new Event('submit')); | |
| 2435 | + } | |
| 2436 | + }); | |
| 3591 | 2437 | } |
| 2438 | + } | |
| 2439 | + | |
| 2440 | +} else if (mxchatChat && mxchatChat.email_collection_enabled) { | |
| 2441 | + console.error('Essential elements for email handling are missing:', { | |
| 2442 | + emailForm: !!emailForm, | |
| 2443 | + emailBlocker: !!emailBlocker, | |
| 2444 | + chatbotWrapper: !!chatbotWrapper | |
| 3592 | 2445 | }); |
| 3593 | 2446 | } |
| 3594 | 2447 | |
| 3595 | - // Open chatbot when pre-chat message is clicked - use class selector for multi-instance | |
| 3596 | - $(document).on('click', '.pre-chat-message', function() { | |
| 3597 | - var botId = getBotIdFromElement(this); | |
| 3598 | - var $chatbot = getElement(botId, 'floating-chatbot'); | |
| 3599 | - if ($chatbot.hasClass('hidden')) { | |
| 3600 | - $chatbot.removeClass('hidden').addClass('visible'); | |
| 3601 | - getElement(botId, 'floating-chatbot-button').addClass('hidden'); | |
| 3602 | - handlePreChatDismissal(botId); | |
| 2448 | + | |
| 2449 | + // Open chatbot when pre-chat message is clicked | |
| 2450 | + $(document).on('click', '#pre-chat-message', function() { | |
| 2451 | + var chatbot = $('#floating-chatbot'); | |
| 2452 | + if (chatbot.hasClass('hidden')) { | |
| 2453 | + chatbot.removeClass('hidden').addClass('visible'); | |
| 2454 | + $('#floating-chatbot-button').addClass('hidden'); | |
| 2455 | + $('#pre-chat-message').fadeOut(250); // Hide pre-chat message | |
| 3603 | 2456 | disableScroll(); // Disable scroll when chatbot opens |
| 3604 | - | |
| 3605 | - // Load chat history for returning visitors (persistence) | |
| 3606 | - var chatPersistenceEnabled = typeof mxchatChat !== 'undefined' && mxchatChat.chat_persistence_toggle === 'on'; | |
| 3607 | - if (chatPersistenceEnabled) { | |
| 3608 | - MxChatInstances.ensureSession(botId); | |
| 3609 | - } | |
| 3610 | - | |
| 3611 | - // Deferred email check — only on first widget open | |
| 3612 | - var emailBlocker = getElementDOM(botId, 'email-blocker'); | |
| 3613 | - var instance = MxChatInstances.get(botId); | |
| 3614 | - if (emailBlocker && !instance.emailCheckDone) { | |
| 3615 | - instance.emailCheckDone = true; | |
| 3616 | - resolveEmailState(botId); | |
| 3617 | - } else if (!emailBlocker) { | |
| 3618 | - showChatContainerForBot(botId); | |
| 3619 | - } | |
| 3620 | 2457 | } |
| 3621 | 2458 | }); |
| 3622 | 2459 | |
| 3623 | - // Legacy duplicate close handler removed — handled by single event delegation above | |
| 2460 | + var closeButton = document.querySelector('.close-pre-chat-message'); | |
| 2461 | + if (closeButton) { | |
| 2462 | + closeButton.addEventListener('click', function() { | |
| 2463 | + $('#pre-chat-message').fadeOut(200); // Hide the message | |
| 3624 | 2464 | |
| 2465 | + // Send an AJAX request to set the transient flag for 24 hours | |
| 2466 | + $.ajax({ | |
| 2467 | + url: mxchatChat.ajax_url, | |
| 2468 | + type: 'POST', | |
| 2469 | + data: { | |
| 2470 | + action: 'mxchat_dismiss_pre_chat_message', | |
| 2471 | + _ajax_nonce: mxchatChat.nonce | |
| 2472 | + }, | |
| 2473 | + success: function() { | |
| 2474 | + //console.log('Pre-chat message dismissed for 24 hours.'); | |
| 3625 | 2475 | |
| 3626 | -function hasQuickQuestions(botId) { | |
| 3627 | - botId = botId || 'default'; | |
| 3628 | - var questionsContainer = getElementDOM(botId, 'mxchat-popular-questions'); | |
| 3629 | - if (!questionsContainer) return false; | |
| 3630 | - const questionButtons = questionsContainer.querySelectorAll('.mxchat-popular-question'); | |
| 2476 | + // Ensure the message is hidden after dismissal | |
| 2477 | + $('#pre-chat-message').hide(); | |
| 2478 | + }, | |
| 2479 | + error: function() { | |
| 2480 | + ////console.error('Failed to dismiss pre-chat message.'); | |
| 2481 | + } | |
| 2482 | + }); | |
| 2483 | + }); | |
| 2484 | + } | |
| 2485 | + | |
| 2486 | + | |
| 2487 | +function hasQuickQuestions() { | |
| 2488 | + const questionButtons = document.querySelectorAll('#mxchat-popular-questions .mxchat-popular-question'); | |
| 3631 | 2489 | return questionButtons.length > 0; |
| 3632 | 2490 | } |
| 3633 | 2491 | |
| 3634 | -/** | |
| 3635 | - * Check if a bot is embedded (not floating) | |
| 3636 | - * Embedded bots don't have a .floating-chatbot wrapper | |
| 3637 | - */ | |
| 3638 | -function isEmbeddedBot(botId) { | |
| 3639 | - botId = botId || 'default'; | |
| 3640 | - var floatingWrapper = document.getElementById('floating-chatbot-' + botId); | |
| 3641 | - return !floatingWrapper; | |
| 3642 | -} | |
| 3643 | - | |
| 3644 | -function collapseQuickQuestions(botId) { | |
| 3645 | - botId = botId || 'default'; | |
| 3646 | - const questionsContainer = getElementDOM(botId, 'mxchat-popular-questions'); | |
| 3647 | - if (questionsContainer && hasQuickQuestions(botId)) { | |
| 2492 | +function collapseQuickQuestions() { | |
| 2493 | + const questionsContainer = document.getElementById('mxchat-popular-questions'); | |
| 2494 | + if (questionsContainer && hasQuickQuestions()) { | |
| 3648 | 2495 | questionsContainer.classList.add('collapsed'); |
| 3649 | 2496 | questionsContainer.classList.add('has-been-collapsed'); |
| 3650 | 2497 | try { |
| 3651 | - sessionStorage.setItem('mxchat_questions_collapsed_' + botId, 'true'); | |
| 3652 | - sessionStorage.setItem('mxchat_questions_has_been_collapsed_' + botId, 'true'); | |
| 2498 | + sessionStorage.setItem('mxchat_questions_collapsed', 'true'); | |
| 2499 | + sessionStorage.setItem('mxchat_questions_has_been_collapsed', 'true'); | |
| 3653 | 2500 | } catch (e) { |
| 3654 | 2501 | // Ignore if sessionStorage is not available |
| 3655 | 2502 | } |
| 3656 | 2503 | } |
| @@ -3655,15 +2502,14 @@ | ||
| 3655 | 2502 | } |
| 3656 | 2503 | } |
| 3657 | 2504 | } |
| 3658 | 2505 | |
| 3659 | -function expandQuickQuestions(botId) { | |
| 3660 | - botId = botId || 'default'; | |
| 3661 | - const questionsContainer = getElementDOM(botId, 'mxchat-popular-questions'); | |
| 3662 | - if (questionsContainer && hasQuickQuestions(botId)) { | |
| 2506 | +function expandQuickQuestions() { | |
| 2507 | + const questionsContainer = document.getElementById('mxchat-popular-questions'); | |
| 2508 | + if (questionsContainer && hasQuickQuestions()) { | |
| 3663 | 2509 | questionsContainer.classList.remove('collapsed'); |
| 3664 | 2510 | try { |
| 3665 | - sessionStorage.setItem('mxchat_questions_collapsed_' + botId, 'false'); | |
| 2511 | + sessionStorage.setItem('mxchat_questions_collapsed', 'false'); | |
| 3666 | 2512 | } catch (e) { |
| 3667 | 2513 | // Ignore if sessionStorage is not available |
| 3668 | 2514 | } |
| 3669 | 2515 | } |
| @@ -3668,24 +2514,18 @@ | ||
| 3668 | 2514 | } |
| 3669 | 2515 | } |
| 3670 | 2516 | } |
| 3671 | 2517 | |
| 3672 | -function checkQuickQuestionsState(botId) { | |
| 3673 | - botId = botId || 'default'; | |
| 3674 | - if (!hasQuickQuestions(botId)) { | |
| 2518 | +function checkQuickQuestionsState() { | |
| 2519 | + if (!hasQuickQuestions()) { | |
| 3675 | 2520 | return; // Don't do anything if no questions exist |
| 3676 | 2521 | } |
| 3677 | - | |
| 3678 | - // Skip restoring collapsed state for embedded bots - they should always start expanded | |
| 3679 | - if (isEmbeddedBot(botId)) { | |
| 3680 | - return; | |
| 3681 | - } | |
| 3682 | - | |
| 2522 | + | |
| 3683 | 2523 | try { |
| 3684 | - const isCollapsed = sessionStorage.getItem('mxchat_questions_collapsed_' + botId); | |
| 3685 | - const hasBeenCollapsed = sessionStorage.getItem('mxchat_questions_has_been_collapsed_' + botId); | |
| 3686 | - | |
| 3687 | - const questionsContainer = getElementDOM(botId, 'mxchat-popular-questions'); | |
| 2524 | + const isCollapsed = sessionStorage.getItem('mxchat_questions_collapsed'); | |
| 2525 | + const hasBeenCollapsed = sessionStorage.getItem('mxchat_questions_has_been_collapsed'); | |
| 2526 | + | |
| 2527 | + const questionsContainer = document.getElementById('mxchat-popular-questions'); | |
| 3688 | 2528 | if (questionsContainer) { |
| 3689 | 2529 | if (hasBeenCollapsed === 'true') { |
| 3690 | 2530 | questionsContainer.classList.add('has-been-collapsed'); |
| 3691 | 2531 | } |
| @@ -3697,37 +2537,33 @@ | ||
| 3697 | 2537 | // Ignore if sessionStorage is not available |
| 3698 | 2538 | } |
| 3699 | 2539 | } |
| 3700 | 2540 | |
| 3701 | -// Global delegation for dynamically added links as fallback | |
| 3702 | -// Use class selector for multi-instance support | |
| 3703 | -$(document).on('click', '.chat-box a[href]:not([data-tracked])', function(e) { | |
| 2541 | +// NEW: Global delegation for dynamically added links as fallback | |
| 2542 | +$(document).on('click', '#chat-box a[href]:not([data-tracked])', function(e) { | |
| 3704 | 2543 | const $link = $(this); |
| 3705 | 2544 | const messageDiv = $link.closest('.bot-message, .agent-message'); |
| 3706 | - | |
| 2545 | + | |
| 3707 | 2546 | // Only process bot/agent message links |
| 3708 | 2547 | if (messageDiv.length > 0) { |
| 3709 | 2548 | const originalHref = $link.attr('href'); |
| 3710 | - | |
| 2549 | + | |
| 3711 | 2550 | if (originalHref && (originalHref.startsWith('http://') || originalHref.startsWith('https://'))) { |
| 3712 | 2551 | e.preventDefault(); |
| 3713 | 2552 | e.stopPropagation(); |
| 3714 | - | |
| 2553 | + | |
| 3715 | 2554 | // Mark as tracked |
| 3716 | 2555 | $link.attr('data-tracked', 'true'); |
| 3717 | - | |
| 3718 | - // Get bot ID from the chat box context | |
| 3719 | - var botId = getBotIdFromElement(this); | |
| 3720 | - | |
| 2556 | + | |
| 3721 | 2557 | // Get message context from the message div |
| 3722 | 2558 | const messageText = messageDiv.text().substring(0, 200); |
| 3723 | - | |
| 2559 | + | |
| 3724 | 2560 | $.ajax({ |
| 3725 | 2561 | url: mxchatChat.ajax_url, |
| 3726 | 2562 | type: 'POST', |
| 3727 | 2563 | data: { |
| 3728 | 2564 | action: 'mxchat_track_url_click', |
| 3729 | - session_id: getChatSession(botId), | |
| 2565 | + session_id: getChatSession(), | |
| 3730 | 2566 | url: originalHref, |
| 3731 | 2567 | message_context: messageText, |
| 3732 | 2568 | nonce: mxchatChat.nonce |
| 3733 | 2569 | }, |
| @@ -3738,58 +2574,45 @@ | ||
| 3738 | 2574 | window.location.href = originalHref; |
| 3739 | 2575 | } |
| 3740 | 2576 | } |
| 3741 | 2577 | }); |
| 3742 | - | |
| 2578 | + | |
| 3743 | 2579 | return false; |
| 3744 | 2580 | } |
| 3745 | 2581 | } |
| 3746 | 2582 | }); |
| 3747 | 2583 | |
| 3748 | - // ==================================== | |
| 3749 | - // MAIN INITIALIZATION | |
| 3750 | - // ==================================== | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | +// ==================================== | |
| 2588 | +// MAIN INITIALIZATION | |
| 2589 | +// ==================================== | |
| 3751 | 2590 | |
| 3752 | - // Initialize all chatbot instances on the page | |
| 3753 | - initializeAllInstances(); | |
| 2591 | +if ($('#floating-chatbot').hasClass('hidden')) { | |
| 2592 | + $('#floating-chatbot-button').removeClass('hidden'); | |
| 2593 | +} | |
| 2594 | +// Initialize when document is ready | |
| 2595 | +setFullHeight(); | |
| 2596 | +initializeChatVisibility(); | |
| 2597 | +loadChatHistory(); | |
| 2598 | +trackOriginatingPage(); | |
| 3754 | 2599 | |
| 3755 | - // Legacy initialization for single bot compatibility | |
| 3756 | - $('.floating-chatbot.hidden').each(function() { | |
| 3757 | - var botId = getBotIdFromElement(this); | |
| 3758 | - getElement(botId, 'floating-chatbot-button').removeClass('hidden'); | |
| 3759 | - }); | |
| 2600 | +// Make functions globally available for add-ons | |
| 2601 | +window.hasQuickQuestions = hasQuickQuestions; | |
| 2602 | +window.collapseQuickQuestions = collapseQuickQuestions; | |
| 2603 | +window.appendMessage = appendMessage; | |
| 2604 | +window.appendThinkingMessage = appendThinkingMessage; | |
| 2605 | +window.scrollToBottom = scrollToBottom; | |
| 2606 | +window.scrollElementToTop = scrollElementToTop; | |
| 2607 | +window.replaceLastMessage = replaceLastMessage; | |
| 2608 | +window.callMxChat = callMxChat; | |
| 2609 | +window.callMxChatStream = callMxChatStream; | |
| 2610 | +window.shouldUseStreaming = shouldUseStreaming; | |
| 2611 | +window.getChatSession = getChatSession; | |
| 2612 | +window.getPageContext = getPageContext; | |
| 2613 | +window.updateStreamingMessage = updateStreamingMessage; | |
| 3760 | 2614 | |
| 3761 | - // Initialize when document is ready | |
| 3762 | - setFullHeight(); | |
| 3763 | - | |
| 3764 | - // Note: trackOriginatingPage() and loadChatHistory() are now deferred | |
| 3765 | - // until the user's first interaction via MxChatInstances.ensureSession() | |
| 3766 | - | |
| 3767 | - // Initialize chat visibility for all instances | |
| 3768 | - $('.mxchat-chatbot-wrapper').each(function() { | |
| 3769 | - var botId = $(this).data('bot-id') || 'default'; | |
| 3770 | - initializeChatVisibility(botId); | |
| 3771 | - }); | |
| 3772 | - | |
| 3773 | - // Make functions globally available for add-ons | |
| 3774 | - window.hasQuickQuestions = hasQuickQuestions; | |
| 3775 | - window.collapseQuickQuestions = collapseQuickQuestions; | |
| 3776 | - window.appendMessage = appendMessage; | |
| 3777 | - window.appendThinkingMessage = appendThinkingMessage; | |
| 3778 | - window.scrollToBottom = scrollToBottom; | |
| 3779 | - window.scrollElementToTop = scrollElementToTop; | |
| 3780 | - window.replaceLastMessage = replaceLastMessage; | |
| 3781 | - window.callMxChat = callMxChat; | |
| 3782 | - window.callMxChatStream = callMxChatStream; | |
| 3783 | - window.shouldUseStreaming = shouldUseStreaming; | |
| 3784 | - window.getChatSession = getChatSession; | |
| 3785 | - window.getPageContext = getPageContext; | |
| 3786 | - window.updateStreamingMessage = updateStreamingMessage; | |
| 3787 | - window.MxChatInstances = MxChatInstances; | |
| 3788 | - window.getElement = getElement; | |
| 3789 | - window.getElementDOM = getElementDOM; | |
| 3790 | - window.getBotIdFromElement = getBotIdFromElement; | |
| 3791 | - | |
| 3792 | 2615 | }); // End of jQuery ready |
| 3793 | 2616 | |
| 3794 | 2617 | |
| 3795 | 2618 | // ==================================== |
| @@ -3817,5 +2640,10 @@ | ||
| 3817 | 2640 | }); |
| 3818 | 2641 | } |
| 3819 | 2642 | } |
| 3820 | 2643 | }); |
| 2644 | + | |
| 2645 | + | |
| 2646 | + | |
| 2647 | + | |
| 2648 | + | |
| 3821 | 2649 | |
