Braille improvements in contenteditables.

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

 // Copyright 2014 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.ChromeVoxEditableContentEditable');
 goog.provide('cvox.ChromeVoxEditableHTMLInput');
 goog.provide('cvox.ChromeVoxEditableTextArea');
 goog.provide('cvox.ChromeVoxEditableTextBase');
 goog.provide('cvox.TextChangeEvent');
 goog.provide('cvox.TextHandlerInterface');
@@ skipping 357 matching lines @@
     this.describeSelectionChanged(evt);
   } else {
     this.describeTextChanged(evt);
   }
   this.lastChangeDescribed = true;
 
   this.value = evt.value;
   this.start = evt.start;
   this.end = evt.end;
 
-  if (this.brailleHandler_) {
-    var line = this.getLine(this.getLineIndex(evt.start));
-    var lineStart = this.getLineStart(this.getLineIndex(evt.start));
-    var start = evt.start - lineStart;
-    var end = Math.min(evt.end - lineStart, line.length);
-    this.brailleHandler_.changed(line, start, end, this.multiline, this.node,
-                                lineStart);
-  }
+  this.brailleCurrentLine_();
 };
 
 
 /**
+ * Shows the current line on the braille display.
+ * @private
+ */
+cvox.ChromeVoxEditableTextBase.prototype.brailleCurrentLine_ = function() {
+  if (this.brailleHandler_) {
+    var lineIndex = this.getLineIndex(this.start);
+    var line = this.getLine(lineIndex);
+    // Collapsable whitespace inside the contenteditable is represented
+    // as non-breaking spaces.  This confuses braille input (which relies on
+    // the text being added to be the same as the text in the input field).
+    // Since the non-breaking spaces are just an artifact of how
+    // contenteditable is implemented, normalize to normal spaces instead.
+    if (this instanceof cvox.ChromeVoxEditableContentEditable) {

[David Tseng, 2014/12/04 22:53:26]

Does this belong in the subclass (i.e. replace value on |evt|/normalize evt
itself)?

+      line = line.replace(/\u00A0/g, ' ');
+    }
+    var lineStart = this.getLineStart(lineIndex);
+    var start = this.start - lineStart;
+    var end = Math.min(this.end - lineStart, line.length);
+    console.log('Changed: ' + line + ' ' + start + ' ' + end + ' ' + lineStart);

[David Tseng, 2014/12/04 22:53:26]

Remove.

+    this.brailleHandler_.changed(line, start, end, this.multiline, this.node,
+                                 lineStart);
+  }
+};
+
+/**
  * Describe a change in the selection or cursor position when the text
  * 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
 
@@ skipping 841 matching lines @@
  * @override
  */
 cvox.ChromeVoxEditableContentEditable.prototype.changed =
     function(evt) {
   if (!evt.triggeredByUser) {
     return;
   }
   // Take over here if we can't describe a change; assume it's a blank line.
   if (!this.shouldDescribeChange(evt)) {
     this.speak(cvox.ChromeVox.msgs.getMsg('text_box_blank'), true);
+    if (this.brailleHandler_) {
+      this.brailleHandler_.changed('' /*line*/, 0 /*start*/, 0 /*end*/,
+                                   true /*multiline*/, null /*element*/,
+                                   evt.start /*lineStart*/);
+    }
   } else {
     goog.base(this, 'changed', evt);
   }
 };
 
 
 /** @override */
 cvox.ChromeVoxEditableContentEditable.prototype.moveCursorToNextCharacter =
     function() {
   window.getSelection().modify('move', 'forward', 'character');
@@ skipping 61 matching lines @@
     // but there is still content after the new line (like the example
     // above after "Title"). In these cases, we "pretend" we're the
     // last character so we speak "blank".
     return false;
   }
 
   // Otherwise, we should never speak "blank" no matter what (even if
   // we're at the end of a content editable).
   return true;
 };