Merge f65913e into 3fe762c

XLTechie · web-flow · commit 6e7a3d185a04 · 2023-02-23T14:51:05.000+10:00
diff --git a/source/message.html b/source/message.html
@@ -1,4 +1,3 @@
-
 <!doctype html>
 <HTML style="width : 350; height: 300">
 <HEAD>
@@ -15,7 +14,7 @@
 function windowOnLoad() {
 	// #5875: string.prototype.split strips the tail when a limit is supplied,
 	// so use a regexp instead.
-	var args = window.dialogArguments.match(/^(.*?);([\s\S]*)$/);
+	var args = window.dialogArguments.match(/^(.*?)__NVDA:split-here__([\s\S]*)$/);
 	// args[0] is the whole string.
 	if (args && args.length == 3){
 		document.title= args[1];
diff --git a/source/ui.py b/source/ui.py
@@ -88,6 +88,7 @@ def browseableMessage(message: str, title: Optional[str] = None, isHtml: bool =
 	@param title: The title for the message.
 	@param isHtml: Whether the message is html
 	"""
+	splitWith: str = "__NVDA:split-here__"  # Unambiguous regex splitter for javascript in message.html, #14667
 	if _isSecureDesktop():
 		import wx  # Late import to prevent circular dependency.
 		wx.CallAfter(_warnBrowsableMessageNotAvailableOnSecureScreens, title)
@@ -103,7 +104,7 @@ def browseableMessage(message: str, title: Optional[str] = None, isHtml: bool =
 		title = _("NVDA Message")
 	if not isHtml:
 		message = f"<pre>{escape(message)}</pre>"
-	dialogString = f"{title};{message}"
+	dialogString = f"{title}{splitWith}{message}"
 	dialogArguements = automation.VARIANT( dialogString )
 	gui.mainFrame.prePopup() 
 	windll.mshtml.ShowHTMLDialogEx( 
