orca r4089 - in trunk: . src/orca/scripts/toolkits/Gecko test/keystrokes/firefox

[joanied svn gnome org]

Author: joanied
Date: Fri Aug  8 15:41:09 2008
New Revision: 4089
URL: http://svn.gnome.org/viewvc/orca?rev=4089&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  test/keystrokes/firefox/html_role_combo_box.py:
  Fix for bug #546895 - Braille context includes previous menu item
  in HTML combo boxes.



Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/toolkits/Gecko/script.py
   trunk/test/keystrokes/firefox/html_role_combo_box.py

Modified: trunk/src/orca/scripts/toolkits/Gecko/script.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/script.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/script.py	Fri Aug  8 15:41:09 2008
@@ -4694,6 +4694,7 @@
 
             prevExtents = self.getExtents(prevObj, pOffset, pOffset + 1)
             if self.onSameLine(extents, prevExtents) \
+               and extents != prevExtents \
                and lastExtents != prevExtents \
                or prevExtents == (0, 0, 0, 0):
                 toAdd = self.getObjectsFromEOCs(prevObj, pOffset, boundary)
@@ -4737,6 +4738,7 @@
             nextExtents = self.getExtents(nextObj, nOffset, nOffset + 1)
 
             if self.onSameLine(extents, nextExtents) \
+               and extents != nextExtents \
                and lastExtents != nextExtents \
                or nextExtents == (0, 0, 0, 0):
                 toAdd = self.getObjectsFromEOCs(nextObj, nOffset, boundary)

Modified: trunk/test/keystrokes/firefox/html_role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_role_combo_box.py	(original)
+++ trunk/test/keystrokes/firefox/html_role_combo_box.py	Fri Aug  8 15:41:09 2008
@@ -95,9 +95,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Change selection Down: Low",
-    ["BUG? - We're picking up the previous menu item in the braille context",
-     "BRAILLE LINE:  'Normal Combo Low'",
-     "     VISIBLE:  'Normal Combo Low', cursor=14",
+    ["BRAILLE LINE:  'Low'",
+     "     VISIBLE:  'Low', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Low'"]))
 
@@ -108,9 +107,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Change selection Up: Normal",
-    ["BUG? - We're picking up the previous menu item in the braille context",
-     "BRAILLE LINE:  'High Combo Normal'",
-     "     VISIBLE:  'High Combo Normal', cursor=12",
+    ["BRAILLE LINE:  'Normal'",
+     "     VISIBLE:  'Normal', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Normal'"]))