[orca] Check for duplicate segments when building words from embedded objects



commit 3ca4669654e21cc14c3ad9ae8d5b48ff47f2b1df
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Feb 18 12:34:14 2017 -0500

    Check for duplicate segments when building words from embedded objects

 src/orca/scripts/web/script_utilities.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index 239509d..05a613f 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -1155,6 +1155,9 @@ class Utilities(script_utilities.Utilities):
             if not onLeft:
                 break
 
+            if self._contentIsSubsetOf(objects[0], onLeft[-1]):
+                objects.pop(0)
+
             objects[0:0] = onLeft
             firstObj, firstStart, firstEnd, firstString = objects[0]
             prevObj, pOffset = self.findPreviousCaretInOrder(firstObj, firstStart)
@@ -1164,6 +1167,9 @@ class Utilities(script_utilities.Utilities):
         while lastObj and lastString and not lastString[-1].isspace():
             nextObj, nOffset = self.findNextCaretInOrder(lastObj, lastEnd - 1)
             onRight = self._getContentsForObj(nextObj, nOffset, boundary)
+            if onRight and self._contentIsSubsetOf(objects[0], onRight[-1]):
+                onRight = onRight[0:-1]
+
             onRight = list(filter(_include, onRight))
             if not onRight:
                 break


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