orca r4442 - in trunk: . src/orca test/keystrokes/firefox
- From: joanied svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r4442 - in trunk: . src/orca test/keystrokes/firefox
- Date: Wed, 21 Jan 2009 07:45:35 +0000 (UTC)
Author: joanied
Date: Wed Jan 21 07:45:35 2009
New Revision: 4442
URL: http://svn.gnome.org/viewvc/orca?rev=4442&view=rev
Log:
* src/orca/structural_navigation.py:
test/keystrokes/firefox/html_struct_nav_bug_567984.py:
Rest of the fix (hopefully) for bug #567984 - Structural
navigation needs to consider text within the document frame.
Modified:
trunk/ChangeLog
trunk/src/orca/structural_navigation.py
trunk/test/keystrokes/firefox/html_struct_nav_bug_567984.py
Modified: trunk/src/orca/structural_navigation.py
==============================================================================
--- trunk/src/orca/structural_navigation.py (original)
+++ trunk/src/orca/structural_navigation.py Wed Jan 21 07:45:35 2009
@@ -930,6 +930,16 @@
"""
currentObj = currentObj or self.getCurrentObject()
+ document = self._getDocument()
+
+ # If the current object is the document itself, find an actual
+ # object to use as the starting point. Otherwise we're in
+ # danger of skipping over the objects in between our present
+ # location and top of the document.
+ #
+ if self._script.isSameObject(currentObj, document):
+ currentObj = self._findNextObject(currentObj, document)
+
ancestors = []
obj = currentObj.parent
if obj.getRole() in [pyatspi.ROLE_LIST, pyatspi.ROLE_TABLE]:
@@ -939,7 +949,6 @@
ancestors.append(obj)
obj = obj.parent
- document = self._getDocument()
match, wrapped = None, False
results = collection.getMatchesTo(currentObj,
matchRule,
@@ -1062,6 +1071,16 @@
"""
currentObj = currentObj or self.getCurrentObject()
+ document = self._getDocument()
+
+ # If the current object is the document itself, find an actual
+ # object to use as the starting point. Otherwise we're in
+ # danger of skipping over the objects in between our present
+ # location and top of the document.
+ #
+ if self._script.isSameObject(currentObj, document):
+ currentObj = self._findNextObject(currentObj, document)
+
ancestors = []
nestableRoles = [pyatspi.ROLE_LIST, pyatspi.ROLE_TABLE]
obj = currentObj.parent
@@ -1069,7 +1088,6 @@
ancestors.append(obj)
obj = obj.parent
- document = self._getDocument()
obj = self._findPreviousObject(currentObj, document)
wrapped = obj is None
match = None
Modified: trunk/test/keystrokes/firefox/html_struct_nav_bug_567984.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_bug_567984.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_bug_567984.py Wed Jan 21 07:45:35 2009
@@ -118,6 +118,29 @@
"SPEECH OUTPUT: 'Hamarosan Ãjraindul a gÃzszÃllÃtÃs link heading level 3'"]))
########################################################################
+# Down Arrow to move to some text in the document frame
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "9. Down",
+ ["BRAILLE LINE: 'MegÃllapodott Putyin Ãs Tyimosenko az orosz-ukrÃn szerzÃdÃsrÃl. Amint lepapÃrozzÃk, jÃn a gÃz.'",
+ " VISIBLE: 'MegÃllapodott Putyin Ãs Tyimosen', cursor=1",
+ "SPEECH OUTPUT: 'MegÃllapodott Putyin Ãs Tyimosenko az orosz-ukrÃn szerzÃdÃsrÃl. Amint lepapÃrozzÃk, jÃn a gÃz.'"]))
+
+########################################################################
+# Shift+ H to move to the previous heading. It should NOT be the last
+# heading.
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Shift>h"))
+sequence.append(utils.AssertPresentationAction(
+ "10. Shift+h",
+ ["BRAILLE LINE: 'Hamarosan Ãjraindul a gÃzszÃllÃtÃs h3'",
+ " VISIBLE: 'Hamarosan Ãjraindul a gÃzszÃllÃt', cursor=1",
+ "SPEECH OUTPUT: 'Hamarosan Ãjraindul a gÃzszÃllÃtÃs link heading level 3'"]))
+
+########################################################################
# Move to the location bar by pressing Control+L. When it has focus
# type "about:blank" and press Return to restore the browser to the
# conditions at the test's start.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]