[orca] Remove the isTextArea check from sayAll



commit 8e9c86e29c618a2f3db0e43f08dde4ba872320c7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Feb 22 13:26:46 2014 -0500

    Remove the isTextArea check from sayAll
    
    This check filters out objects which we do not which to filter out.
    If an ojbect implements AtkText, there should be something sayAll-able.

 src/orca/scripts/default.py |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index a0ca272..24f16bc 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -1821,21 +1821,21 @@ class Script(script.Script):
                     break
 
             speech.speak(utterances)
+            return
 
-        elif self.utilities.isTextArea(orca_state.locusOfFocus):
-            try:
-                orca_state.locusOfFocus.queryText()
-            except NotImplementedError:
-                utterances = self.speechGenerator.generateSpeech(
-                    orca_state.locusOfFocus)
-                utterances.extend(self.tutorialGenerator.getTutorial(
-                           orca_state.locusOfFocus, False))
-                speech.speak(utterances)
-            except AttributeError:
-                pass
-            else:
-                speech.sayAll(self.textLines(orca_state.locusOfFocus),
-                              self.__sayAllProgressCallback)
+        try:
+            orca_state.locusOfFocus.queryText()
+        except NotImplementedError:
+            utterances = self.speechGenerator.generateSpeech(
+                orca_state.locusOfFocus)
+            utterances.extend(self.tutorialGenerator.getTutorial(
+                orca_state.locusOfFocus, False))
+            speech.speak(utterances)
+        except AttributeError:
+            pass
+        else:
+            speech.sayAll(self.textLines(orca_state.locusOfFocus),
+                          self.__sayAllProgressCallback)
 
         return True
 


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