[orca] Don't treat iframe contents as being on same line as iframe siblings



commit a42b542e60b2e2e08572e291b2b159add8d6f434
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri May 10 16:54:08 2019 +0200

    Don't treat iframe contents as being on same line as iframe siblings

 src/orca/scripts/web/script_utilities.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index 26ded036c..01f3ca36a 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -1495,11 +1495,12 @@ class Utilities(script_utilities.Utilities):
             lastObj, lastEnd = self.lastContext(lastObj)
             lastEnd += 1
 
+        document = self.getDocumentForObject(obj)
         prevObj, pOffset = self.findPreviousCaretInOrder(firstObj, firstStart)
         nextObj, nOffset = self.findNextCaretInOrder(lastObj, lastEnd - 1)
 
         # Check for things on the same line to the left of this object.
-        while prevObj:
+        while prevObj and self.getDocumentForObject(prevObj) == document:
             text = self.queryNonEmptyText(prevObj)
             if text and text.getText(pOffset, pOffset + 1) in [" ", "\xa0"]:
                 prevObj, pOffset = self.findPreviousCaretInOrder(prevObj, pOffset)
@@ -1517,7 +1518,7 @@ class Utilities(script_utilities.Utilities):
             prevObj, pOffset = self.findPreviousCaretInOrder(firstObj, firstStart)
 
         # Check for things on the same line to the right of this object.
-        while nextObj:
+        while nextObj and self.getDocumentForObject(nextObj) == document:
             text = self.queryNonEmptyText(nextObj)
             if text and text.getText(nOffset, nOffset + 1) in [" ", "\xa0"]:
                 nextObj, nOffset = self.findNextCaretInOrder(nextObj, nOffset)


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