Improve braille related message descriptions and clean up message handling in Chromevox.

chrome/browser/resources/chromeos/chromevox/common/editable_text_base.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 goog.provide('cvox.ChromeVoxEditableTextBase');
 goog.provide('cvox.TextChangeEvent');
 goog.provide('cvox.TypingEcho');
 
 goog.require('cvox.AbstractTts');
 goog.require('cvox.ChromeVox');
@@ skipping 320 matching lines @@
  * stays the same.
  * @param {cvox.TextChangeEvent} evt The text change event.
  */
 cvox.ChromeVoxEditableTextBase.prototype.describeSelectionChanged =
     function(evt) {
   // TODO(deboer): Factor this into two function:
   //   - one to determine the selection event
   //   - one to speak
 
   if (this.isPassword) {
-    this.speak((new goog.i18n.MessageFormat(cvox.ChromeVox.msgs.getMsg('dot'))
+    this.speak((new goog.i18n.MessageFormat(Msgs.getMsg('dot'))
         .format({'COUNT': 1})), evt.triggeredByUser);
     return;
   }
   if (evt.start == evt.end) {
     // It's currently a cursor.
     if (this.start != this.end) {
       // It was previously a selection, so just announce 'unselected'.
-      this.speak(cvox.ChromeVox.msgs.getMsg('Unselected'), evt.triggeredByUser);
+      this.speak(Msgs.getMsg('Unselected'), evt.triggeredByUser);
     } else if (this.getLineIndex(this.start) !=
         this.getLineIndex(evt.start)) {
       // Moved to a different line; read it.
       var lineValue = this.getLine(this.getLineIndex(evt.start));
       if (lineValue == '') {
-        lineValue = cvox.ChromeVox.msgs.getMsg('text_box_blank');
+        lineValue = Msgs.getMsg('text_box_blank');
       } else if (/^\s+$/.test(lineValue)) {
-        lineValue = cvox.ChromeVox.msgs.getMsg('text_box_whitespace');
+        lineValue = Msgs.getMsg('text_box_whitespace');
       }
       this.speak(lineValue, evt.triggeredByUser);
     } else if (this.start == evt.start + 1 ||
         this.start == evt.start - 1) {
       // Moved by one character; read it.
       if (!cvox.ChromeVoxEditableTextBase.useIBeamCursor) {
         if (evt.start == this.value.length) {
           if (cvox.ChromeVox.verbosity == cvox.VERBOSITY_VERBOSE) {
-            this.speak(cvox.ChromeVox.msgs.getMsg('end_of_text_verbose'),
+            this.speak(Msgs.getMsg('end_of_text_verbose'),
                        evt.triggeredByUser);
           } else {
-            this.speak(cvox.ChromeVox.msgs.getMsg('end_of_text_brief'),
+            this.speak(Msgs.getMsg('end_of_text_brief'),
                        evt.triggeredByUser);
           }
         } else {
           this.speak(this.value.substr(evt.start, 1),
                      evt.triggeredByUser,
                      {'phoneticCharacters': evt.triggeredByUser});
         }
       } else {
         this.speak(this.value.substr(Math.min(this.start, evt.start), 1),
             evt.triggeredByUser,
             {'phoneticCharacters': evt.triggeredByUser});
       }
     } else {
       // Moved by more than one character. Read all characters crossed.
       this.speak(this.value.substr(Math.min(this.start, evt.start),
           Math.abs(this.start - evt.start)), evt.triggeredByUser);
     }
   } else {
     // It's currently a selection.
     if (this.start + 1 == evt.start &&
         this.end == this.value.length &&
         evt.end == this.value.length) {
       // Autocomplete: the user typed one character of autocompleted text.
       this.speak(this.value.substr(this.start, 1), evt.triggeredByUser);
       this.speak(this.value.substr(evt.start));
     } else if (this.start == this.end) {
       // It was previously a cursor.
       this.speak(this.value.substr(evt.start, evt.end - evt.start),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('selected'));
+      this.speak(Msgs.getMsg('selected'));
     } else if (this.start == evt.start && this.end < evt.end) {
       this.speak(this.value.substr(this.end, evt.end - this.end),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('added_to_selection'));
+      this.speak(Msgs.getMsg('added_to_selection'));
     } else if (this.start == evt.start && this.end > evt.end) {
       this.speak(this.value.substr(evt.end, this.end - evt.end),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('removed_from_selection'));
+      this.speak(Msgs.getMsg('removed_from_selection'));
     } else if (this.end == evt.end && this.start > evt.start) {
       this.speak(this.value.substr(evt.start, this.start - evt.start),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('added_to_selection'));
+      this.speak(Msgs.getMsg('added_to_selection'));
     } else if (this.end == evt.end && this.start < evt.start) {
       this.speak(this.value.substr(this.start, evt.start - this.start),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('removed_from_selection'));
+      this.speak(Msgs.getMsg('removed_from_selection'));
     } else {
       // The selection changed but it wasn't an obvious extension of
       // a previous selection. Just read the new selection.
       this.speak(this.value.substr(evt.start, evt.end - evt.start),
                  evt.triggeredByUser);
-      this.speak(cvox.ChromeVox.msgs.getMsg('selected'));
+      this.speak(Msgs.getMsg('selected'));
     }
   }
 };
 
 
 /**
  * Describe a change where the text changes.
  * @param {cvox.TextChangeEvent} evt The text change event.
  */
 cvox.ChromeVoxEditableTextBase.prototype.describeTextChanged = function(evt) {
   var personality = {};
   if (evt.value.length < this.value.length) {
     personality = cvox.AbstractTts.PERSONALITY_DELETED;
   }
   if (this.isPassword) {
-    this.speak((new goog.i18n.MessageFormat(cvox.ChromeVox.msgs.getMsg('dot'))
+    this.speak((new goog.i18n.MessageFormat(Msgs.getMsg('dot'))
         .format({'COUNT': 1})), evt.triggeredByUser, personality);
     return;
   }
 
   var value = this.value;
   var len = value.length;
   var newLen = evt.value.length;
   var autocompleteSuffix = '';
   // Make a copy of evtValue and evtEnd to avoid changing anything in
   // the event itself.
@@ skipping 76 matching lines @@
       } else if (value.indexOf(evtValue) == 1) {
         this.speak(value[0], evt.triggeredByUser, personality);
         return;
       }
     }
   }
 
   if (this.multiline) {
     // Fall back to announce deleted but omit the text that was deleted.
     if (evt.value.length < this.value.length) {
-      this.speak(cvox.ChromeVox.msgs.getMsg('text_deleted'),
+      this.speak(Msgs.getMsg('text_deleted'),
                  evt.triggeredByUser, personality);
     }
     // The below is a somewhat loose way to deal with non-standard
     // insertions/deletions. Intentionally skip for multiline since deletion
     // announcements are covered above and insertions are non-standard (possibly
     // due to auto complete). Since content editable's often refresh content by
     // removing and inserting entire chunks of text, this type of logic often
     // results in unintended consequences such as reading all text when only one
     // character has been entered.
     return;
@@ skipping 158 matching lines @@
 
 /**
  * Moves the cursor backward by one paragraph.
  * @return {boolean} True if the action was handled.
  */
 cvox.ChromeVoxEditableTextBase.prototype.moveCursorToPreviousParagraph =
     function() { return false; };
 
 
 /******************************************/