Merge 0d8ac55 into 14a9499

mwhapples · web-flow · commit 568b2858c387 · 2022-03-25T03:36:03.000+10:00
diff --git a/source/NVDAObjects/JAB/__init__.py b/source/NVDAObjects/JAB/__init__.py
@@ -97,6 +97,11 @@
 
 re_simpleXmlTag=re.compile(r"\<[^>]+\>")
 
+def _processHtml(text):
+	""" Strips HTML tags from text if it is HTML """
+	return re_simpleXmlTag.sub(" ", text) if text.startswith("<html>") else text
+
+
 class JABTextInfo(textInfos.offsets.OffsetsTextInfo):
 
 	def _getOffsetFromPoint(self,x,y):
@@ -274,7 +279,8 @@ def _get_keyboardShortcut(self):
 		return ", ".join(shortcutsList)
 
 	def _get_name(self):
-		return re_simpleXmlTag.sub(" ", self._JABAccContextInfo.name)
+		name = self._JABAccContextInfo.name
+		return _processHtml(name)
 
 	def _get_JABRole(self):
 		return self._JABAccContextInfo.role_en_US
@@ -315,7 +321,8 @@ def _get_value(self):
 			return self.jabContext.getCurrentAccessibleValueFromContext()
 
 	def _get_description(self):
-		return re_simpleXmlTag.sub(" ", self._JABAccContextInfo.description)
+		description = self._JABAccContextInfo.description
+		return _processHtml(description)
 
 	def _get_location(self):
 		return RectLTWH(self._JABAccContextInfo.x,self._JABAccContextInfo.y,self._JABAccContextInfo.width,self._JABAccContextInfo.height)
@@ -548,6 +555,7 @@ def event_gainFocus(self):
 		if activeDescendant:
 			eventHandler.queueEvent("gainFocus",activeDescendant)
 
+
 class ComboBox(JAB):
 
 	def _get_states(self):
