[orca] Fix a couple of tracebacks seen after text refactor



commit 540652525bd7e3155755c6c5fbfdc0afff5a19a9
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Feb 16 20:41:41 2016 -0500

    Fix a couple of tracebacks seen after text refactor

 src/orca/script_utilities.py             |    2 +-
 src/orca/scripts/web/script_utilities.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index da32a99..2d553b4 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -2220,7 +2220,7 @@ class Utilities:
             #
             childOffset = 0
             for child in obj:
-                if Utilities.characterOffsetInParent(child) >= startOffset:
+                if self.characterOffsetInParent(child) >= startOffset:
                     break
                 childOffset += 1
 
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index 425d996..13ed859 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -2749,7 +2749,7 @@ class Utilities(script_utilities.Utilities):
         if self.isSameObject(obj, documentFrame):
             return None, -1
 
-        while obj.parent:
+        while obj and obj.parent:
             if self.isDetachedDocument(obj.parent):
                 obj = self.iframeForDetachedDocument(obj.parent)
                 continue
@@ -2813,7 +2813,7 @@ class Utilities(script_utilities.Utilities):
         if self.isSameObject(obj, documentFrame):
             return None, -1
 
-        while obj.parent:
+        while obj and obj.parent:
             if self.isDetachedDocument(obj.parent):
                 obj = self.iframeForDetachedDocument(obj.parent)
                 continue


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