Support multi-line braille in the virtual braille display.

chrome/browser/resources/chromeos/chromevox/chromevox/background/options.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.
 
 /**
  * @fileoverview ChromeVox options page.
  *
  */
 
 goog.provide('cvox.OptionsPage');
 
 goog.require('Msgs');
+goog.require('PanelCommand');
 goog.require('cvox.BrailleTable');
 goog.require('cvox.BrailleTranslatorManager');
 goog.require('cvox.ChromeEarcons');
 goog.require('cvox.ChromeTts');
 goog.require('cvox.ChromeVox');
 goog.require('cvox.ChromeVoxPrefs');
 goog.require('cvox.CommandStore');
 goog.require('cvox.ExtensionBridge');
 goog.require('cvox.KeyMap');
 goog.require('cvox.KeySequence');
@@ skipping 41 matching lines @@
   cvox.OptionsPage.populateVoicesSelect();
   cvox.BrailleTable.getAll(function(tables) {
     /** @type {!Array<cvox.BrailleTable.Table>} */
     cvox.OptionsPage.brailleTables = tables;
     cvox.OptionsPage.populateBrailleTablesSelect();
   });
   chrome.storage.local.get({'brailleWordWrap': true}, function(items) {
     $('brailleWordWrap').checked = items.brailleWordWrap;
   });
 
+  $('virtual_braille_display_rows_input').value =
+      localStorage['virtualBrailleRows'];
+  $('virtual_braille_display_columns_input').value =
+      localStorage['virtualBrailleColumns'];
+  var changeToInterleave =
+      Msgs.getMsg('options_change_current_display_style_interleave');
+  var changeToSideBySide =
+      Msgs.getMsg('options_change_current_display_style_side_by_side');
+  var currentlyDisplayingInterleave =
+      Msgs.getMsg('options_current_display_style_interleave');
+  var currentlyDisplayingSideBySide =
+      Msgs.getMsg('options_current_display_style_side_by_side');
+  $('changeDisplayStyle').textContent =
+      localStorage['brailleSideBySide'] === 'true' ?
+      changeToInterleave : changeToSideBySide;
+  $('currentDisplayStyle').textContent =
+      localStorage['brailleSideBySide'] === 'true' ?
+      currentlyDisplayingSideBySide : currentlyDisplayingInterleave;
+
+
   Msgs.addTranslatedMessagesToDom(document);
   cvox.OptionsPage.hidePlatformSpecifics();
 
   cvox.OptionsPage.update();
 
   document.addEventListener('change', cvox.OptionsPage.eventListener, false);
   document.addEventListener('click', cvox.OptionsPage.eventListener, false);
   document.addEventListener('keydown', cvox.OptionsPage.eventListener, false);
 
   cvox.ExtensionBridge.addMessageListener(function(message) {
     if (message['keyBindings'] || message['prefs']) {
       cvox.OptionsPage.update();
     }
   });
 
   $('selectKeys').addEventListener(
       'click', cvox.OptionsPage.reset, false);
 
   if (cvox.PlatformUtil.matchesPlatform(cvox.PlatformFilter.WML)) {
     $('version').textContent =
         chrome.app.getDetails().version;
   }
+
+  var clearVirtualDisplay = function() {
+    var groups = [];
+    var sizeOfDisplay = parseInt(localStorage['virtualBrailleRows'], 10) *
+        parseInt(localStorage['virtualBrailleColumns'], 10);
+    for (var i = 0; i < sizeOfDisplay; i++) {
+        groups.push(['X', 'X']);
+    }
+    (new PanelCommand(PanelCommandType.UPDATE_BRAILLE,
+                      {groups: groups})).send();
+  };
+
+  $('changeDisplayStyle').addEventListener('click', function(evt) {
+    var sideBySide = localStorage['brailleSideBySide'] !== 'true';
+    localStorage['brailleSideBySide'] = sideBySide;
+    $('changeDisplayStyle').textContent =
+        sideBySide ? changeToInterleave : changeToSideBySide;
+    $('currentDisplayStyle').textContent =
+        sideBySide ? currentlyDisplayingSideBySide :
+        currentlyDisplayingInterleave;
+    clearVirtualDisplay();
+  }, true);
+
+  handleNumbericalInputPref('virtual_braille_display_rows_input',
+      'virtualBrailleRows');
+  handleNumbericalInputPref('virtual_braille_display_columns_input',
+      'virtualBrailleColumns');
 };
 
 /**
  * Update the value of controls to match the current preferences.
  * This happens if the user presses a key in a tab that changes a
  * pref.
  */
 cvox.OptionsPage.update = function() {
   var prefs = cvox.OptionsPage.prefs.getPrefs();
   for (var key in prefs) {
     // TODO(rshearer): 'active' is a pref, but there's no place in the
     // options page to specify whether you want ChromeVox active.
     var elements = document.querySelectorAll('*[name="' + key + '"]');
     for (var i = 0; i < elements.length; i++) {
       cvox.OptionsPage.setValue(elements[i], prefs[key]);
     }
   }
 };
+/**
+ * Adds event listeners to input boxes to update local storage values and
+ * make sure that the input is a positive nonempty number between 1 and 99.
+ * @param {string} id Id of the input box.
+ * @param {string} pref Preference key in localStorage to access and modify.
+ */
+var handleNumbericalInputPref = function(id, pref) {
+  $(id).addEventListener('input', function(evt) {
+    if ($(id).value === '')
+      return;

[dmazzoni, 2016/10/31 20:03:44]

nit: Need braces throughout this if/else

[ultimatedbz, 2016/10/31 20:05:57]

What if I bring line 173 up to line 172 so the whole else/if is only one line,
assuming that it fits?

[dmazzoni, 2016/10/31 20:55:41]

If it fits, that's fine. If anything wraps then uses braces for everything.

[ultimatedbz, 2016/10/31 20:57:15]

Gotcha!

+    else if (parseInt($(id).value, 10) < 1 ||
+        parseInt($(id).value, 10) > 99)
+      $(id).value = localStorage[pref];
+    else
+      localStorage[pref] = $(id).value;
+  }, true);
+
+  $(id).addEventListener('focusout', function(evt) {
+    if ($(id).value === '')
+      $(id).value = localStorage[pref];
+  }, true);
+};
 
 /**
  * Populate the keymap select element with stored keymaps
  */
 cvox.OptionsPage.populateKeyMapSelect = function() {
   var select = $('cvox_keymaps');
   for (var id in cvox.KeyMap.AVAILABLE_MAP_INFO) {
     var info = cvox.KeyMap.AVAILABLE_MAP_INFO[id];
     var option = document.createElement('option');
     option.id = id;
@@ skipping 243 matching lines @@
 /**
  * @return {cvox.BrailleTranslatorManager}
  */
 cvox.OptionsPage.getBrailleTranslatorManager = function() {
   return chrome.extension.getBackgroundPage()['braille_translator_manager'];
 };
 
 document.addEventListener('DOMContentLoaded', function() {
   cvox.OptionsPage.init();
 }, false);