Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_welcome.js

Issue 2681923005: ChromeOS OOBE: Add ARIA-labels for OOBE screens. (Closed)
Patch Set: Rebased. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview Polymer element for displaying material design OOBE. 6 * @fileoverview Polymer element for displaying material design OOBE.
7 */ 7 */
8 8
9 Polymer({ 9 Polymer({
10 is: 'oobe-welcome-md', 10 is: 'oobe-welcome-md',
11 11
12 properties: { 12 properties: {
13 /** 13 /**
14 * Currently selected system language (display name). 14 * Currently selected system language (display name).
15 */ 15 */
16 currentLanguage: { 16 currentLanguage: {
17 type: String, 17 type: String,
18 value: '', 18 value: '',
19 }, 19 },
20 20
21 /** 21 /**
22 * Currently selected input method (display name).
23 */
24 currentKeyboard: {
25 type: String,
26 value: '',
27 },
28
29 /**
22 * List of languages for language selector dropdown. 30 * List of languages for language selector dropdown.
23 * @type {!Array<OobeTypes.LanguageDsc>} 31 * @type {!Array<OobeTypes.LanguageDsc>}
24 */ 32 */
25 languages: { 33 languages: {
26 type: Array, 34 type: Array,
35 observer: "onLanguagesChanged_",
27 }, 36 },
28 37
29 /** 38 /**
30 * List of keyboards for keyboard selector dropdown. 39 * List of keyboards for keyboard selector dropdown.
31 * @type {!Array<OobeTypes.IMEDsc>} 40 * @type {!Array<OobeTypes.IMEDsc>}
32 */ 41 */
33 keyboards: { 42 keyboards: {
34 type: Array, 43 type: Array,
44 observer: "onKeyboardsChanged_",
35 }, 45 },
36 46
37 /** 47 /**
38 * Flag that shows Welcome screen. 48 * Flag that shows Welcome screen.
39 */ 49 */
40 welcomeScreenShown: { 50 welcomeScreenShown: {
41 type: Boolean, 51 type: Boolean,
42 value: true, 52 value: true,
43 }, 53 },
44 54
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 value: '', 118 value: '',
109 }, 119 },
110 120
111 /** 121 /**
112 * True when connected to a network. 122 * True when connected to a network.
113 * @private 123 * @private
114 */ 124 */
115 isConnected_: { 125 isConnected_: {
116 type: Boolean, 126 type: Boolean,
117 value: false, 127 value: false,
118 } 128 },
129
130 /**
131 * i18n string name for Language dropdown aria-label.
132 */
133 languageDropdownLabel_: {
134 type: String,
135 value: "languageDropdownLabel",
136 },
stevenjb 2017/02/08 20:47:53 I don't think you need this, you can embed string
Alexander Alekseev 2017/02/08 21:43:53 Done.
137
138 /**
139 * i18n string name for Keyboard dropdown aria-label.
140 */
141 keyboardDropdownLabel_: {
142 type: String,
143 value: "keyboardDropdownLabel",
144 },
stevenjb 2017/02/08 20:47:53 ditto
Alexander Alekseev 2017/02/08 21:43:53 Done.
119 }, 145 },
120 146
121 /** @override */ 147 /** @override */
122 ready: function() { 148 ready: function() {
123 CrOncStrings = { 149 CrOncStrings = {
124 OncTypeCellular: loadTimeData.getString('OncTypeCellular'), 150 OncTypeCellular: loadTimeData.getString('OncTypeCellular'),
125 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'), 151 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
126 OncTypeVPN: loadTimeData.getString('OncTypeVPN'), 152 OncTypeVPN: loadTimeData.getString('OncTypeVPN'),
127 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'), 153 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'),
128 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'), 154 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'),
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 409
384 /** 410 /**
385 * Handle language selection. 411 * Handle language selection.
386 * 412 *
387 * @param {!{detail: {!OobeTypes.LanguageDsc}}} event 413 * @param {!{detail: {!OobeTypes.LanguageDsc}}} event
388 * @private 414 * @private
389 */ 415 */
390 onLanguageSelected_: function(event) { 416 onLanguageSelected_: function(event) {
391 var item = event.detail; 417 var item = event.detail;
392 var languageId = item.value; 418 var languageId = item.value;
419 this.currentLanguage = item.title;
393 this.screen.onLanguageSelected_(languageId); 420 this.screen.onLanguageSelected_(languageId);
394 }, 421 },
395 422
396 /** 423 /**
397 * Handle keyboard layout selection. 424 * Handle keyboard layout selection.
398 * 425 *
399 * @param {!{detail: {!OobeTypes.IMEDsc}}} event 426 * @param {!{detail: {!OobeTypes.IMEDsc}}} event
400 * @private 427 * @private
401 */ 428 */
402 onKeyboardSelected_: function(event) { 429 onKeyboardSelected_: function(event) {
403 var item = event.detail; 430 var item = event.detail;
404 var inputMethodId = item.value; 431 var inputMethodId = item.value;
432 this.currentKeyboard = item.title;
405 this.screen.onKeyboardSelected_(inputMethodId); 433 this.screen.onKeyboardSelected_(inputMethodId);
406 }, 434 },
407 435
436 onLanguagesChanged_: function() {
437 this.currentLanguage = Oobe.getSelectedTitle(this.languages);
438 },
439
440 onKeyboardsChanged_: function() {
441 this.currentKeyboard = Oobe.getSelectedTitle(this.keyboards);
442 },
443
408 /** 444 /**
409 * Handle "OK" button for "LanguageSelection" screen. 445 * Handle "OK" button for "LanguageSelection" screen.
410 * 446 *
411 * @private 447 * @private
412 */ 448 */
413 closeLanguageSection_: function() { 449 closeLanguageSection_: function() {
414 this.hideAllScreens_(); 450 this.hideAllScreens_();
415 this.welcomeScreenShown = true; 451 this.welcomeScreenShown = true;
416 }, 452 },
417 453
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 * @param {!{detail: {!OobeTypes.Timezone}}} event 494 * @param {!{detail: {!OobeTypes.Timezone}}} event
459 * @private 495 * @private
460 */ 496 */
461 onTimezoneSelected_: function(event) { 497 onTimezoneSelected_: function(event) {
462 var item = event.detail; 498 var item = event.detail;
463 if (!item) 499 if (!item)
464 return; 500 return;
465 501
466 this.screen.onTimezoneSelected_(item.value); 502 this.screen.onTimezoneSelected_(item.value);
467 }, 503 },
504
505 /**
506 * This function formats message for labels.
507 * @param String label i18n string ID.
508 * @param String parameter i18n string parameter.
509 * @private
510 */
511 formatMessage_: function(label, parameter) {
512 return loadTimeData.getStringF(label, parameter);
513 },
468 }); 514 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698