[orca] Defer more quickly to the default script for ARIA widgets and non-document content



commit ae47cc16f1e28f9e2c7966c63cf244ebbb4611cb
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Nov 12 13:37:30 2013 -0500

    Defer more quickly to the default script for ARIA widgets and non-document content

 src/orca/scripts/toolkits/Gecko/script.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index b7d4097..75c3e22 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1307,6 +1307,11 @@ class Script(default.Script):
         if not event.detail1:
             return
 
+        obj = event.source
+        if self.isAriaWidget(obj) or not self.inDocumentContent(obj):
+            default.Script.onFocusedChanged(self, event)
+            return
+
         try:
             eventSourceRole = event.source.getRole()
         except:
@@ -1363,9 +1368,7 @@ class Script(default.Script):
             except:
                 pass
 
-        elif eventSourceRole != pyatspi.ROLE_LINK \
-             and self.inDocumentContent(event.source) \
-             and not self.isAriaWidget(event.source):
+        elif eventSourceRole != pyatspi.ROLE_LINK:
             [obj, characterOffset] = \
                 self.findFirstCaretContext(event.source, 0)
             self.setCaretContext(obj, characterOffset)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]