Move WebDialog into behaviors and add more detail to docstring.

source/NVDAObjects/IAccessible/ia2Web.py

@@ -13,7 +13,7 @@
 import IAccessibleHandler
 import controlTypes
 from logHandler import log
-from NVDAObjects.behaviors import Dialog, FocusableUnfocusableContainer
+from NVDAObjects.behaviors import Dialog, WebDialog 
 from . import IAccessible
 from .ia2TextMozilla import MozillaCompoundTextInfo
 
@@ -46,21 +46,6 @@ def _get_shouldCreateTreeInterceptor(self):
 class Application(Document):
 	shouldCreateTreeInterceptor = False
 
-class WebDialog(Document):
-	"""
-	A dialog that will use a treeInterceptor if its parent currently does.
-	"""
-
-	def _get_shouldCreateTreeInterceptor(self):
-		if self.parent.treeInterceptor:
-			return True
-		return False
-
-	# For dialogs that will get browseMode and are focusable themselves (have a tabindex):
-	# Allow setting focus to the dialog directly, rather than its first focusable descendant
-	def _get__alwaysFocusFirstfocusableDescendant(self):
-		return not self.shouldCreateTreeInterceptor
-
 class BlockQuote(Ia2Web):
 	role = controlTypes.ROLE_BLOCKQUOTE
 

source/NVDAObjects/behaviors.py

@@ -603,9 +603,6 @@ class FocusableUnfocusableContainer(NVDAObject):
 	isFocusable = True
 
 	def setFocus(self):
-		# provide a way for  sub or super classes to disable this focusable descendant behaviour if necessary.
-		if not getattr(self,'_alwaysFocusFirstfocusableDescendant',True) and super(FocusableUnfocusableContainer,self).isFocusable: 
-			return super(FocusableUnfocusableContainer,self).setFocus()
 		for obj in self.recursiveDescendants:
 			if obj.isFocusable:
 				obj.setFocus()
@@ -663,3 +660,14 @@ def event_suggestionsClosed(self):
 		"""
 		if config.conf["presentation"]["reportAutoSuggestionsWithSound"]:
 			nvwave.playWaveFile(r"waves\suggestionsClosed.wav")
+
+class WebDialog(NVDAObject):
+	"""
+	A dialog that will use a treeInterceptor if its parent currently does.
+	This  can be used to ensure that dialogs on the web get browseMode by default, unless inside an ARIA application
+	"""
+
+	def _get_shouldCreateTreeInterceptor(self):
+		if self.parent.treeInterceptor:
+			return True
+		return False