[orca] Fix several instances where new document name was not being presented
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix several instances where new document name was not being presented
- Date: Wed, 28 Dec 2016 16:10:17 +0000 (UTC)
commit 0f2e2febd1e7be4892a27a5f9f4e207a78b821b8
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Wed Dec 28 11:08:33 2016 -0500
Fix several instances where new document name was not being presented
src/orca/scripts/web/speech_generator.py | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/src/orca/scripts/web/speech_generator.py b/src/orca/scripts/web/speech_generator.py
index b29971a..514fb11 100644
--- a/src/orca/scripts/web/speech_generator.py
+++ b/src/orca/scripts/web/speech_generator.py
@@ -49,15 +49,18 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
if not self._script.utilities.inDocumentContent(obj):
return super()._generateAncestors(obj, **args)
- role = args.get('role', obj.getRole())
- if role == pyatspi.ROLE_LINK:
- return []
-
- if self._script.utilities.isLandmark(obj):
- return []
+ result = []
+ priorObj = args.get('priorObj')
+ if priorObj and self._script.utilities.inDocumentContent(priorObj):
+ priorDoc = self._script.utilities.getDocumentForObject(priorObj)
+ doc = self._script.utilities.getDocumentForObject(obj)
+ if priorDoc != doc:
+ result = [super()._generateName(doc)]
- if self._script.utilities.isMath(obj):
- return []
+ if self._script.utilities.isLink(obj) \
+ or self._script.utilities.isLandmark(obj) \
+ or self._script.utilities.isMath(obj):
+ return result
args['stopAtRoles'] = [pyatspi.ROLE_DOCUMENT_FRAME,
pyatspi.ROLE_DOCUMENT_WEB,
@@ -72,13 +75,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
pyatspi.ROLE_LIST_ITEM,
pyatspi.ROLE_TEXT]
- result = super()._generateAncestors(obj, **args)
- priorObj = args.get('priorObj')
- if priorObj and self._script.utilities.inDocumentContent(priorObj):
- priorDoc = self._script.utilities.getDocumentForObject(priorObj)
- doc = self._script.utilities.getDocumentForObject(obj)
- if priorDoc != doc:
- result.insert(0, super()._generateName(doc))
+ result.extend(super()._generateAncestors(obj, **args))
return result
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]