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

Side by Side Diff: chrome/browser/resources/settings/languages_page/languages_page.html

Issue 2523403003: Language settings: fix focus issues (Closed)
Patch Set: rebase Created 4 years 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 <link rel="import" href="chrome://resources/html/action_link.html">
1 <link rel="import" href="chrome://resources/html/assert.html"> 2 <link rel="import" href="chrome://resources/html/assert.html">
2 <link rel="import" href="chrome://resources/html/cr.html"> 3 <link rel="import" href="chrome://resources/html/cr.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> 9 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
9 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 10 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
10 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html"> 11 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html">
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #uiLanguageItem:focus, 64 #uiLanguageItem:focus,
64 #offerTranslations:focus { 65 #offerTranslations:focus {
65 background-color: transparent; 66 background-color: transparent;
66 } 67 }
67 </style> 68 </style>
68 <settings-languages languages="{{languages}}" prefs="{{prefs}}" 69 <settings-languages languages="{{languages}}" prefs="{{prefs}}"
69 language-helper="{{languageHelper}}"> 70 language-helper="{{languageHelper}}">
70 </settings-languages> 71 </settings-languages>
71 <settings-animated-pages id="pages" section="languages"> 72 <settings-animated-pages id="pages" section="languages">
72 <neon-animatable route-path="default"> 73 <neon-animatable route-path="default">
73 <div class$="settings-box first [[getLanguageListTwoLine_()]]"> 74 <div class$="settings-box first [[getLanguageListTwoLine_()]]"
75 actionable on-tap="toggleExpandButton_">
74 <div class="start"> 76 <div class="start">
75 <div>$i18n{languagesListTitle}</div> 77 <div>$i18n{languagesListTitle}</div>
76 <if expr="chromeos or is_win"> 78 <if expr="chromeos or is_win">
77 <div class="secondary"> 79 <div class="secondary">
78 [[getProspectiveUILanguageName_( 80 [[getProspectiveUILanguageName_(
79 languages, prefs.intl.app_locale.value)]] 81 languages, prefs.intl.app_locale.value)]]
80 </div> 82 </div>
81 </if> 83 </if>
82 </div> 84 </div>
83 <cr-expand-button expanded="{{languagesOpened_}}" 85 <cr-expand-button expanded="{{languagesOpened_}}"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 $i18n{restart} 120 $i18n{restart}
119 </paper-button> 121 </paper-button>
120 </template> 122 </template>
121 </if> 123 </if>
122 <paper-icon-button id="more-[[item.language.code]]" 124 <paper-icon-button id="more-[[item.language.code]]"
123 icon="cr:more-vert" on-tap="onDotsTap_"> 125 icon="cr:more-vert" on-tap="onDotsTap_">
124 </paper-icon-button> 126 </paper-icon-button>
125 </div> 127 </div>
126 </template> 128 </template>
127 <div class="list-item list-button" on-tap="onAddLanguagesTap_"> 129 <div class="list-item list-button" on-tap="onAddLanguagesTap_">
128 $i18n{addLanguages} 130 <a is="action-link">$i18n{addLanguages}</a>
129 </div> 131 </div>
130 </div> 132 </div>
131 </iron-collapse> 133 </iron-collapse>
132 <if expr="chromeos"> 134 <if expr="chromeos">
133 <div id="manage-input-methods-subpage-trigger" 135 <div id="manage-input-methods-subpage-trigger"
134 class="settings-box two-line"> 136 class="settings-box two-line" actionable
137 on-tap="toggleExpandButton_">
135 <div class="start"> 138 <div class="start">
136 <div>$i18n{inputMethodsListTitle}</div> 139 <div>$i18n{inputMethodsListTitle}</div>
137 <div class="secondary"> 140 <div class="secondary">
138 [[getInputMethodName_(languages.inputMethods.currentId)]] 141 [[getInputMethodName_(languages.inputMethods.currentId)]]
139 </div> 142 </div>
140 </div> 143 </div>
141 <cr-expand-button expanded="{{inputMethodsOpened_}}" 144 <cr-expand-button expanded="{{inputMethodsOpened_}}"
142 alt="$i18n{inputMethodsExpandA11yLabel}"> 145 alt="$i18n{inputMethodsExpandA11yLabel}">
143 </cr-expand-button> 146 </cr-expand-button>
144 </div> 147 </div>
145 <iron-collapse id="inputMethodsCollapse" 148 <iron-collapse id="inputMethodsCollapse"
146 opened="[[inputMethodsOpened_]]"> 149 opened="[[inputMethodsOpened_]]">
147 <div class="list-frame vertical-list"> 150 <div class="list-frame vertical-list">
148 <template is="dom-repeat" 151 <template is="dom-repeat"
149 items="[[languages.inputMethods.enabled]]"> 152 items="[[languages.inputMethods.enabled]]">
150 <div class$="list-item [[getInputMethodItemClass_( 153 <div class$="list-item [[getInputMethodItemClass_(
151 item.id, languages.inputMethods.currentId)]]" 154 item.id, languages.inputMethods.currentId)]]"
152 on-tap="onInputMethodTap_" actionable> 155 on-tap="onInputMethodTap_" on-keypress="onInputMethodTap_"
156 actionable tabindex="0">
153 <div class="start"> 157 <div class="start">
154 <div>[[item.displayName]]</div> 158 <div>[[item.displayName]]</div>
155 <div class="explain-selected" 159 <div class="explain-selected"
156 hidden="[[!isCurrentInputMethod_( 160 hidden="[[!isCurrentInputMethod_(
157 item.id, languages.inputMethods.currentId)]]"> 161 item.id, languages.inputMethods.currentId)]]">
158 $i18n{inputMethodEnabled} 162 $i18n{inputMethodEnabled}
159 </div> 163 </div>
160 </div> 164 </div>
161 <paper-icon-button icon="cr:settings" 165 <paper-icon-button icon="cr:settings"
162 on-tap="onInputMethodOptionsTap_" 166 on-tap="onInputMethodOptionsTap_"
163 hidden="[[!item.hasOptionsPage]]"> 167 hidden="[[!item.hasOptionsPage]]">
164 </paper-icon-button> 168 </paper-icon-button>
165 </div> 169 </div>
166 </template> 170 </template>
167 <div class="list-item list-button" 171 <div class="list-item list-button"
168 on-tap="onManageInputMethodsTap_"> 172 on-tap="onManageInputMethodsTap_">
169 $i18n{manageInputMethods} 173 <a is="action-link">$i18n{manageInputMethods}</a>
170 </div> 174 </div>
171 </div> 175 </div>
172 </iron-collapse> 176 </iron-collapse>
173 </if> 177 </if>
174 <if expr="not is_macosx"> 178 <if expr="not is_macosx">
175 <div id="spellcheck-subpage-trigger" class="settings-box two-line"> 179 <div id="spellcheck-subpage-trigger" class="settings-box two-line"
180 actionable on-tap="toggleExpandButton_">
176 <div class="start"> 181 <div class="start">
177 <div>$i18n{spellCheckListTitle}</div> 182 <div>$i18n{spellCheckListTitle}</div>
178 <div class="secondary"> 183 <div class="secondary">
179 [[getSpellCheckSecondaryText_(languages.enabled.*)]] 184 [[getSpellCheckSecondaryText_(languages.enabled.*)]]
180 </div> 185 </div>
181 </div> 186 </div>
182 <cr-expand-button expanded="{{spellCheckOpened_}}" 187 <cr-expand-button expanded="{{spellCheckOpened_}}"
183 alt="$i18n{spellCheckExpandA11yLabel}"> 188 alt="$i18n{spellCheckExpandA11yLabel}">
184 </cr-expand-button> 189 </cr-expand-button>
185 </div> 190 </div>
186 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> 191 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]">
187 <div class="list-frame vertical-list"> 192 <div class="list-frame vertical-list">
188 <template is="dom-repeat" items="[[languages.enabled]]"> 193 <template is="dom-repeat" items="[[languages.enabled]]">
189 <div class="list-item"> 194 <div class="list-item">
190 <paper-checkbox 195 <paper-checkbox
191 checked="[[item.spellCheckEnabled]]" 196 checked="[[item.spellCheckEnabled]]"
192 on-change="onSpellCheckChange_" 197 on-change="onSpellCheckChange_"
193 disabled$="[[!item.language.supportsSpellcheck]]"> 198 disabled$="[[!item.language.supportsSpellcheck]]">
194 [[item.language.displayName]] 199 [[item.language.displayName]]
195 </paper-checkbox> 200 </paper-checkbox>
196 </label> 201 </label>
197 </template> 202 </template>
198 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> 203 <div class="list-item list-button" on-tap="onEditDictionaryTap_">
199 $i18n{manageSpellCheck} 204 <a is="action-link">$i18n{manageSpellCheck}</a>
200 </div> 205 </div>
201 </div> 206 </div>
202 </iron-collapse> 207 </iron-collapse>
203 </if> 208 </if>
204 <template is="cr-lazy-render" id="menu"> 209 <template is="cr-lazy-render" id="menu">
205 <dialog is="cr-action-menu" 210 <dialog is="cr-action-menu"
206 class$="[[getMenuClass_(prefs.translate.enabled.value)]]"> 211 class$="[[getMenuClass_(prefs.translate.enabled.value)]]">
207 <if expr="chromeos or is_win"> 212 <if expr="chromeos or is_win">
208 <paper-checkbox id="uiLanguageItem" class="dropdown-item" 213 <paper-checkbox id="uiLanguageItem" class="dropdown-item"
209 checked="[[isProspectiveUILanguage_( 214 checked="[[isProspectiveUILanguage_(
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 </if> 277 </if>
273 </settings-animated-pages> 278 </settings-animated-pages>
274 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> 279 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
275 <settings-add-languages-dialog languages="{{languages}}" 280 <settings-add-languages-dialog languages="{{languages}}"
276 language-helper="[[languageHelper]]"> 281 language-helper="[[languageHelper]]">
277 </settings-add-languages-dialog> 282 </settings-add-languages-dialog>
278 </template> 283 </template>
279 </template> 284 </template>
280 <script src="languages_page.js"></script> 285 <script src="languages_page.js"></script>
281 </dom-module> 286 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698