| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.html"> |
| 2 <link rel="import" href="chrome://resources/html/cr.html"> | 2 <link rel="import" href="chrome://resources/html/cr.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <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"> | 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-icon/iron-icon.htm
l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 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/neon-animation/neon-ani
matable.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.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-toggle-button/pap
er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 9 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.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/icons.html"> | 10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 <template> | 29 <template> |
| 30 <style include="settings-shared"> | 30 <style include="settings-shared"> |
| 31 .list-button { | 31 .list-button { |
| 32 @apply(--settings-actionable); | 32 @apply(--settings-actionable); |
| 33 } | 33 } |
| 34 </style> | 34 </style> |
| 35 <settings-languages languages="{{languages}}"></settings-languages> | 35 <settings-languages languages="{{languages}}"></settings-languages> |
| 36 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 36 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
| 37 section="languages"> | 37 section="languages"> |
| 38 <neon-animatable id="main"> | 38 <neon-animatable id="main"> |
| 39 <div class="settings-box first two-line"> | 39 <div id="manage-languages-subpage-trigger" |
| 40 class="settings-box first two-line"> |
| 40 <div class="start"> | 41 <div class="start"> |
| 41 <div>$i18n{languagesListTitle}</div> | 42 <div>$i18n{languagesListTitle}</div> |
| 42 <div class="secondary"> | 43 <div class="secondary"> |
| 43 [[getProspectiveUILanguageName_( | 44 [[getProspectiveUILanguageName_( |
| 44 languages, prefs.intl.app_locale.value)]] | 45 languages, prefs.intl.app_locale.value)]] |
| 45 </div> | 46 </div> |
| 46 </div> | 47 </div> |
| 47 <cr-expand-button expanded="{{languagesOpened_}}"> | 48 <cr-expand-button expanded="{{languagesOpened_}}"> |
| 48 </cr-expand-button> | 49 </cr-expand-button> |
| 49 </div> | 50 </div> |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 </div> | 104 </div> |
| 104 </iron-dropdown> | 105 </iron-dropdown> |
| 105 </div> | 106 </div> |
| 106 </template> | 107 </template> |
| 107 <div class="list-item list-button" on-tap="onManageLanguagesTap_"> | 108 <div class="list-item list-button" on-tap="onManageLanguagesTap_"> |
| 108 $i18n{manageLanguages} | 109 $i18n{manageLanguages} |
| 109 </div> | 110 </div> |
| 110 </div> | 111 </div> |
| 111 </iron-collapse> | 112 </iron-collapse> |
| 112 <if expr="chromeos"> | 113 <if expr="chromeos"> |
| 113 <div class="settings-box two-line"> | 114 <div id="manage-input-methods-subpage-trigger" |
| 115 class="settings-box two-line"> |
| 114 <div class="start"> | 116 <div class="start"> |
| 115 <div>$i18n{inputMethodsListTitle}</div> | 117 <div>$i18n{inputMethodsListTitle}</div> |
| 116 <div class="secondary"> | 118 <div class="secondary"> |
| 117 [[getInputMethodName_(languages.inputMethods.currentId)]] | 119 [[getInputMethodName_(languages.inputMethods.currentId)]] |
| 118 </div> | 120 </div> |
| 119 </div> | 121 </div> |
| 120 <cr-expand-button expanded="{{inputMethodsOpened_}}"> | 122 <cr-expand-button expanded="{{inputMethodsOpened_}}"> |
| 121 </cr-expand-button> | 123 </cr-expand-button> |
| 122 </div> | 124 </div> |
| 123 <iron-collapse id="inputMethodsCollapse" | 125 <iron-collapse id="inputMethodsCollapse" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 142 </div> | 144 </div> |
| 143 </template> | 145 </template> |
| 144 <div class="list-item list-button" | 146 <div class="list-item list-button" |
| 145 on-tap="onManageInputMethodsTap_"> | 147 on-tap="onManageInputMethodsTap_"> |
| 146 $i18n{manageInputMethods} | 148 $i18n{manageInputMethods} |
| 147 </div> | 149 </div> |
| 148 </div> | 150 </div> |
| 149 </iron-collapse> | 151 </iron-collapse> |
| 150 </if> | 152 </if> |
| 151 <if expr="not is_macosx"> | 153 <if expr="not is_macosx"> |
| 152 <div class="settings-box two-line"> | 154 <div id="spellcheck-subpage-trigger" class="settings-box two-line"> |
| 153 <div class="start"> | 155 <div class="start"> |
| 154 <div>$i18n{spellCheckListTitle}</div> | 156 <div>$i18n{spellCheckListTitle}</div> |
| 155 <div class="secondary"> | 157 <div class="secondary"> |
| 156 [[getSpellCheckSecondaryText_(languages.enabled.*)]] | 158 [[getSpellCheckSecondaryText_(languages.enabled.*)]] |
| 157 </div> | 159 </div> |
| 158 </div> | 160 </div> |
| 159 <cr-expand-button expanded="{{spellCheckOpened_}}"> | 161 <cr-expand-button expanded="{{spellCheckOpened_}}"> |
| 160 </cr-expand-button> | 162 </cr-expand-button> |
| 161 </div> | 163 </div> |
| 162 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> | 164 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 179 </label> | 181 </label> |
| 180 </template> | 182 </template> |
| 181 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> | 183 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> |
| 182 $i18n{manageSpellCheck} | 184 $i18n{manageSpellCheck} |
| 183 </div> | 185 </div> |
| 184 </div> | 186 </div> |
| 185 </iron-collapse> | 187 </iron-collapse> |
| 186 </if> | 188 </if> |
| 187 </neon-animatable> | 189 </neon-animatable> |
| 188 <template is="dom-if" name="manage-languages"> | 190 <template is="dom-if" name="manage-languages"> |
| 189 <settings-subpage page-title="$i18n{manageLanguagesPageTitle}"> | 191 <settings-subpage |
| 192 associated-control="[[$$('#manage-languages-subpage-trigger')]]" |
| 193 page-title="$i18n{manageLanguagesPageTitle}"> |
| 190 <settings-manage-languages-page | 194 <settings-manage-languages-page |
| 191 prefs="{{prefs}}"></settings-manage-languages-page> | 195 prefs="{{prefs}}"></settings-manage-languages-page> |
| 192 </settings-subpage> | 196 </settings-subpage> |
| 193 </template> | 197 </template> |
| 194 <template is="dom-if" name="language-detail"> | 198 <template is="dom-if" name="language-detail"> |
| 195 <settings-subpage | 199 <settings-subpage no-associated-control |
| 196 page-title="[[detailLanguage_.language.displayName]]"> | 200 page-title="[[detailLanguage_.language.displayName]]"> |
| 197 <settings-language-detail-page id="languageDetailPage" | 201 <settings-language-detail-page id="languageDetailPage" |
| 198 prefs="{{prefs}}" detail="[[detailLanguage_]]"> | 202 prefs="{{prefs}}" detail="[[detailLanguage_]]"> |
| 199 </settings-language-detail-page> | 203 </settings-language-detail-page> |
| 200 </settings-subpage> | 204 </settings-subpage> |
| 201 </template> | 205 </template> |
| 202 <if expr="chromeos"> | 206 <if expr="chromeos"> |
| 203 <template is="dom-if" name="manage-input-methods"> | 207 <template is="dom-if" name="manage-input-methods"> |
| 204 <settings-subpage page-title="$i18n{manageInputMethodsPageTitle}"> | 208 <settings-subpage |
| 209 associated-control="[[$$('#manage-input-methods-subpage-trigger')]]" |
| 210 page-title="$i18n{manageInputMethodsPageTitle}"> |
| 205 <settings-manage-input-methods-page> | 211 <settings-manage-input-methods-page> |
| 206 </settings-manage-input-methods-page> | 212 </settings-manage-input-methods-page> |
| 207 </settings-subpage> | 213 </settings-subpage> |
| 208 </template> | 214 </template> |
| 209 </if> | 215 </if> |
| 210 <if expr="not is_macosx"> | 216 <if expr="not is_macosx"> |
| 211 <template is="dom-if" name="edit-dictionary"> | 217 <template is="dom-if" name="edit-dictionary"> |
| 212 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> | 218 <settings-subpage |
| 219 associated-control="[[$$('#spellcheck-subpage-trigger')]]" |
| 220 page-title="$i18n{editDictionaryPageTitle}"> |
| 213 <settings-edit-dictionary-page></settings-edit-dictionary-page> | 221 <settings-edit-dictionary-page></settings-edit-dictionary-page> |
| 214 </settings-subpage> | 222 </settings-subpage> |
| 215 </template> | 223 </template> |
| 216 </if> | 224 </if> |
| 217 </settings-animated-pages> | 225 </settings-animated-pages> |
| 218 </template> | 226 </template> |
| 219 <script src="languages_page.js"></script> | 227 <script src="languages_page.js"></script> |
| 220 </dom-module> | 228 </dom-module> |
| OLD | NEW |