orca r4332 - in branches/gnome-2-24: . src/orca/scripts/toolkits/Gecko test/keystrokes/firefox

[joanied svn gnome org]

Author: joanied
Date: Thu Nov 13 22:22:54 2008
New Revision: 4332
URL: http://svn.gnome.org/viewvc/orca?rev=4332&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  test/keystrokes/firefox/line_nav_slash_test.py:
  Fix for bug #559839 - Orca sometimes includes content from other
  lines when navigating via Up/Down Arrow in Firefox 3.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/orca/scripts/toolkits/Gecko/script.py
   branches/gnome-2-24/test/keystrokes/firefox/line_nav_slash_test.py

Modified: branches/gnome-2-24/src/orca/scripts/toolkits/Gecko/script.py
==============================================================================
--- branches/gnome-2-24/src/orca/scripts/toolkits/Gecko/script.py	(original)
+++ branches/gnome-2-24/src/orca/scripts/toolkits/Gecko/script.py	Thu Nov 13 22:22:54 2008
@@ -4997,12 +4997,17 @@
             if text:
                 line = text.getTextAtOffset(pOffset, boundary)
                 pOffset = line[1]
+                # If a line begins with a link, getTextAtOffset might
+                # return a zero-length string. If we have a valid offset
+                # increment the pOffset by 1 before getting the extents.
+                #
+                if line[1] > 0 and line[1] == line[2]:
+                    pOffset += 1
 
             prevExtents = self.getExtents(prevObj, pOffset, pOffset + 1)
             if self.onSameLine(extents, prevExtents) \
                and extents != prevExtents \
-               and lastExtents != prevExtents \
-               or prevExtents == (0, 0, 0, 0):
+               and lastExtents != prevExtents:
                 toAdd = self.getObjectsFromEOCs(prevObj, pOffset, boundary)
                 objects[0:0] = toAdd
             else:

Modified: branches/gnome-2-24/test/keystrokes/firefox/line_nav_slash_test.py
==============================================================================
--- branches/gnome-2-24/test/keystrokes/firefox/line_nav_slash_test.py	(original)
+++ branches/gnome-2-24/test/keystrokes/firefox/line_nav_slash_test.py	Thu Nov 13 22:22:54 2008
@@ -77,7 +77,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'Recent Tags Slashdot Login h4'",
+    ["BRAILLE LINE:  'Slashdot Login h4'",
      "     VISIBLE:  'Slashdot Login h4', cursor=1",
      "SPEECH OUTPUT: 'Slashdot Login heading level 4'"]))
 
@@ -126,8 +126,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Down",
-    ["BRAILLE LINE:  'Book Reviews Older Stuff h4'",
-     "     VISIBLE:  'Book Reviews Older Stuff h4', cursor=19",
+    ["BRAILLE LINE:  'Older Stuff h4'",
+     "     VISIBLE:  'Older Stuff h4', cursor=1",
      "SPEECH OUTPUT: 'Older Stuff heading level 4'"]))
 
 sequence.append(utils.StartRecordingAction())