Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 116 $i18n{restart} | 118 $i18n{restart} |
| 117 </paper-button> | 119 </paper-button> |
| 118 </template> | 120 </template> |
| 119 </if> | 121 </if> |
| 120 <paper-icon-button id="more-[[item.language.code]]" | 122 <paper-icon-button id="more-[[item.language.code]]" |
| 121 icon="cr:more-vert" on-tap="onDotsTap_"> | 123 icon="cr:more-vert" on-tap="onDotsTap_"> |
| 122 </paper-icon-button> | 124 </paper-icon-button> |
| 123 </div> | 125 </div> |
| 124 </template> | 126 </template> |
| 125 <div class="list-item list-button" on-tap="onAddLanguagesTap_"> | 127 <div class="list-item list-button" on-tap="onAddLanguagesTap_"> |
| 126 $i18n{addLanguages} | 128 <a is="action-link">$i18n{addLanguages}</a> |
| 127 </div> | 129 </div> |
| 128 </div> | 130 </div> |
| 129 </iron-collapse> | 131 </iron-collapse> |
| 130 <if expr="chromeos"> | 132 <if expr="chromeos"> |
| 131 <div id="manage-input-methods-subpage-trigger" | 133 <div id="manage-input-methods-subpage-trigger" |
| 132 class="settings-box two-line"> | 134 class="settings-box two-line" actionable |
| 135 on-tap="toggleExpandButton_"> | |
| 133 <div class="start"> | 136 <div class="start"> |
| 134 <div>$i18n{inputMethodsListTitle}</div> | 137 <div>$i18n{inputMethodsListTitle}</div> |
| 135 <div class="secondary"> | 138 <div class="secondary"> |
| 136 [[getInputMethodName_(languages.inputMethods.currentId)]] | 139 [[getInputMethodName_(languages.inputMethods.currentId)]] |
| 137 </div> | 140 </div> |
| 138 </div> | 141 </div> |
| 139 <cr-expand-button expanded="{{inputMethodsOpened_}}" | 142 <cr-expand-button expanded="{{inputMethodsOpened_}}" |
| 140 alt="$i18n{inputMethodsExpandA11yLabel}"> | 143 alt="$i18n{inputMethodsExpandA11yLabel}"> |
| 141 </cr-expand-button> | 144 </cr-expand-button> |
| 142 </div> | 145 </div> |
| 143 <iron-collapse id="inputMethodsCollapse" | 146 <iron-collapse id="inputMethodsCollapse" |
| 144 opened="[[inputMethodsOpened_]]"> | 147 opened="[[inputMethodsOpened_]]"> |
| 145 <div class="list-frame vertical-list"> | 148 <div class="list-frame vertical-list"> |
| 146 <template is="dom-repeat" | 149 <template is="dom-repeat" |
| 147 items="[[languages.inputMethods.enabled]]"> | 150 items="[[languages.inputMethods.enabled]]"> |
| 148 <div class$="list-item [[getInputMethodItemClass_( | 151 <div class$="list-item [[getInputMethodItemClass_( |
| 149 item.id, languages.inputMethods.currentId)]]" | 152 item.id, languages.inputMethods.currentId)]]" |
| 150 on-tap="onInputMethodTap_" actionable> | 153 on-tap="onInputMethodTap_" on-keypress="onInputMethodTap_" |
| 154 actionable tabindex="0"> | |
| 151 <div class="start"> | 155 <div class="start"> |
| 152 <div>[[item.displayName]]</div> | 156 <div>[[item.displayName]]</div> |
| 153 <div class="explain-selected" | 157 <div class="explain-selected" |
| 154 hidden="[[!isCurrentInputMethod_( | 158 hidden="[[!isCurrentInputMethod_( |
| 155 item.id, languages.inputMethods.currentId)]]"> | 159 item.id, languages.inputMethods.currentId)]]"> |
| 156 $i18n{inputMethodEnabled} | 160 $i18n{inputMethodEnabled} |
| 157 </div> | 161 </div> |
| 158 </div> | 162 </div> |
| 159 <paper-icon-button icon="cr:settings" | 163 <paper-icon-button icon="cr:settings" |
| 160 on-tap="onInputMethodOptionsTap_" | 164 on-tap="onInputMethodOptionsTap_" |
| 161 hidden="[[!item.hasOptionsPage]]"> | 165 hidden="[[!item.hasOptionsPage]]"> |
| 162 </paper-icon-button> | 166 </paper-icon-button> |
| 163 </div> | 167 </div> |
| 164 </template> | 168 </template> |
| 165 <div class="list-item list-button" | 169 <div class="list-item list-button" |
| 166 on-tap="onManageInputMethodsTap_"> | 170 on-tap="onManageInputMethodsTap_"> |
| 167 $i18n{manageInputMethods} | 171 <a is="action-link">$i18n{manageInputMethods}</a> |
| 168 </div> | 172 </div> |
| 169 </div> | 173 </div> |
| 170 </iron-collapse> | 174 </iron-collapse> |
| 171 </if> | 175 </if> |
| 172 <if expr="not is_macosx"> | 176 <if expr="not is_macosx"> |
| 173 <div id="spellcheck-subpage-trigger" class="settings-box two-line"> | 177 <div id="spellcheck-subpage-trigger" |
| 178 class$="settings-box [[getSpellcheckListTwoLine_( | |
|
michaelpg
2016/12/01 23:19:13
Note this additional change... originally I didn't
| |
| 179 languages.enabled.*)]]" | |
| 180 actionable on-tap="toggleExpandButton_"> | |
| 174 <div class="start"> | 181 <div class="start"> |
| 175 <div>$i18n{spellCheckListTitle}</div> | 182 <div>$i18n{spellCheckListTitle}</div> |
| 176 <div class="secondary"> | 183 <div class="secondary"> |
| 177 [[getSpellCheckSecondaryText_(languages.enabled.*)]] | 184 [[getSpellCheckSecondaryText_(languages.enabled.*)]] |
| 178 </div> | 185 </div> |
| 179 </div> | 186 </div> |
| 180 <cr-expand-button expanded="{{spellCheckOpened_}}" | 187 <cr-expand-button expanded="{{spellCheckOpened_}}" |
| 181 alt="$i18n{spellCheckExpandA11yLabel}"> | 188 alt="$i18n{spellCheckExpandA11yLabel}"> |
| 182 </cr-expand-button> | 189 </cr-expand-button> |
| 183 </div> | 190 </div> |
| 184 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> | 191 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> |
| 185 <div class="list-frame vertical-list"> | 192 <div class="list-frame vertical-list"> |
| 186 <template is="dom-repeat" items="[[languages.enabled]]"> | 193 <template is="dom-repeat" items="[[languages.enabled]]"> |
| 187 <div class="list-item"> | 194 <div class="list-item"> |
| 188 <paper-checkbox | 195 <paper-checkbox |
| 189 checked="[[item.spellCheckEnabled]]" | 196 checked="[[item.spellCheckEnabled]]" |
| 190 on-change="onSpellCheckChange_" | 197 on-change="onSpellCheckChange_" |
| 191 disabled$="[[!item.language.supportsSpellcheck]]"> | 198 disabled$="[[!item.language.supportsSpellcheck]]"> |
| 192 [[item.language.displayName]] | 199 [[item.language.displayName]] |
| 193 </paper-checkbox> | 200 </paper-checkbox> |
| 194 </label> | 201 </label> |
| 195 </template> | 202 </template> |
| 196 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> | 203 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> |
| 197 $i18n{manageSpellCheck} | 204 <a is="action-link">$i18n{manageSpellCheck}</a> |
| 198 </div> | 205 </div> |
| 199 </div> | 206 </div> |
| 200 </iron-collapse> | 207 </iron-collapse> |
| 201 </if> | 208 </if> |
| 202 <template is="cr-lazy-render" id="menu"> | 209 <template is="cr-lazy-render" id="menu"> |
| 203 <dialog is="cr-action-menu" | 210 <dialog is="cr-action-menu" |
| 204 class$="[[getMenuClass_(prefs.translate.enabled.value)]]"> | 211 class$="[[getMenuClass_(prefs.translate.enabled.value)]]"> |
| 205 <if expr="chromeos or is_win"> | 212 <if expr="chromeos or is_win"> |
| 206 <paper-checkbox id="uiLanguageItem" class="dropdown-item" | 213 <paper-checkbox id="uiLanguageItem" class="dropdown-item" |
| 207 checked="[[isProspectiveUILanguage_( | 214 checked="[[isProspectiveUILanguage_( |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 270 </if> | 277 </if> |
| 271 </settings-animated-pages> | 278 </settings-animated-pages> |
| 272 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> | 279 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> |
| 273 <settings-add-languages-dialog languages="{{languages}}" | 280 <settings-add-languages-dialog languages="{{languages}}" |
| 274 language-helper="[[languageHelper]]"> | 281 language-helper="[[languageHelper]]"> |
| 275 </settings-add-languages-dialog> | 282 </settings-add-languages-dialog> |
| 276 </template> | 283 </template> |
| 277 </template> | 284 </template> |
| 278 <script src="languages_page.js"></script> | 285 <script src="languages_page.js"></script> |
| 279 </dom-module> | 286 </dom-module> |
| OLD | NEW |