Chromium Code Reviews| 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/i18n_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> | |
| 6 <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"> |
| 7 <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/iron-icon/iron-icon.htm l"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 11 <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"> |
| 12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> | 11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> |
| 13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> | 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> |
| 14 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 13 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 15 <link rel="import" href="language_detail_page.html"> | 14 <link rel="import" href="language_detail_page.html"> |
| 16 <link rel="import" href="languages.html"> | 15 <link rel="import" href="languages.html"> |
| 17 <link rel="import" href="manage_languages_page.html"> | 16 <link rel="import" href="manage_languages_page.html"> |
| 18 | 17 |
| 19 <if expr="not is_macosx"> | 18 <if expr="not is_macosx"> |
| 20 <link rel="import" href="edit_dictionary_page.html"> | 19 <link rel="import" href="edit_dictionary_page.html"> |
| 21 </if> | 20 </if> |
| 22 | 21 |
| 23 <dom-module id="settings-languages-page"> | 22 <dom-module id="settings-languages-page"> |
| 24 <template> | 23 <template> |
| 25 <style include="settings-shared"></style> | 24 <style include="settings-shared"> |
| 25 div.list-item[selected] { | |
| 26 font-weight: 500; | |
|
dschuyler
2016/04/06 21:45:50
Would it make sense to have this as
list-item[sel
michaelpg
2016/04/07 14:55:47
Done (also corrected to .selected)
| |
| 27 } | |
| 28 </style> | |
| 26 <settings-languages languages="{{languages}}"></settings-languages> | 29 <settings-languages languages="{{languages}}"></settings-languages> |
| 27 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 30 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
| 28 section="languages"> | 31 section="languages"> |
| 29 <neon-animatable id="main"> | 32 <neon-animatable id="main"> |
| 30 <div class="settings-box first two-line"> | 33 <div class="settings-box first two-line"> |
| 31 <div class="start"> | 34 <div class="start"> |
| 32 <div i18n-content="languagesListTitle"></div> | 35 <div i18n-content="languagesListTitle"></div> |
| 33 <div class="secondary">[[languagesSecondary_]]</div> | 36 <div class="secondary"> |
| 37 [[getProspectiveUILanguageName_(prefs.intl.app_locale.value)]] | |
| 38 </div> | |
| 34 </div> | 39 </div> |
| 35 <cr-expand-button expanded="{{languagesOpened_}}"> | 40 <cr-expand-button expanded="{{languagesOpened_}}"> |
| 36 </cr-expand-button> | 41 </cr-expand-button> |
| 37 </div> | 42 </div> |
| 38 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> | 43 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> |
| 39 <div class="list-frame vertical-list"> | 44 <div class="list-frame vertical-list"> |
| 40 <array-selector id="languageSelector" | |
| 41 selected="{{detailLanguage}}" | |
| 42 items="{{languages.enabledLanguages}}"></array-selector> | |
| 43 <template is="dom-repeat" items="{{languages.enabledLanguages}}"> | 45 <template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
| 44 <div class="list-item" on-tap="onLanguageTap_"> | 46 <div |
| 47 class$="list-item [[getLanguageItemClass_(item.language.code, prefs.intl.app_locale.value)]]" | |
| 48 on-tap="onLanguageTap_"> | |
| 45 <div class="start"> | 49 <div class="start"> |
| 46 <div title="[[item.language.nativeDisplayName]]"> | 50 <div title="[[item.language.nativeDisplayName]]"> |
| 47 [[item.language.displayName]] | 51 [[item.language.displayName]] |
| 48 <if expr="chromeos or is_win"> | 52 <if expr="chromeos or is_win"> |
| 49 <iron-icon icon="done" | 53 <iron-icon icon="done" |
| 50 hidden$="[[!isProspectiveUILanguage_(item.language.code, prefs.intl.app_locale.value)]]"> | 54 hidden$="[[!isProspectiveUILanguage_(item.language.code, prefs.intl.app_locale.value)]]"> |
| 51 </iron-icon> | 55 </iron-icon> |
| 52 </if> | 56 </if> |
| 53 </div> | 57 </div> |
| 54 </div> | 58 </div> |
| 55 <paper-icon-button icon="settings" | 59 <paper-icon-button icon="settings" |
| 56 on-tap="onShowLanguageDetailTap_"></paper-icon-button> | 60 on-tap="onShowLanguageDetailTap_"></paper-icon-button> |
| 57 </div> | 61 </div> |
| 58 </template> | 62 </template> |
| 59 <div class="list-item list-button" i18n-content="manageLanguages" | 63 <div class="list-item list-button" i18n-content="manageLanguages" |
| 60 on-tap="onManageLanguagesTap_"> | 64 on-tap="onManageLanguagesTap_"> |
| 61 </div> | 65 </div> |
| 62 </div> | 66 </div> |
| 63 </iron-collapse> | 67 </iron-collapse> |
| 64 <if expr="chromeos"> | 68 <if expr="chromeos"> |
| 65 <div class="settings-box two-line"> | 69 <div class="settings-box two-line"> |
| 66 <div class="start"> | 70 <div class="start"> |
| 67 <div i18n-content="inputMethodsListTitle"></div> | 71 <div i18n-content="inputMethodsListTitle"></div> |
| 68 <div class="secondary">[[inputMethodsSecondary_]]</div> | 72 <div class="secondary">[[inputMethodsSecondary_]]</div> |
| 69 </div> | 73 </div> |
| 70 <cr-expand-button expanded="{{inputMethodsOpened_}}"> | 74 <cr-expand-button expanded="{{inputMethodsOpened_}}"> |
| 71 </cr-expand-button> | 75 </cr-expand-button> |
| 72 </div> | 76 </div> |
| 73 <iron-collapse id="inputMethodsCollapse" | 77 <iron-collapse id="inputMethodsCollapse" |
| 74 opened="[[inputMethodsOpened_]]"> | 78 opened="[[inputMethodsOpened_]]"> |
| 75 <div class="list-frame vertical-list"> | 79 <div class="list-frame vertical-list"> |
| 76 <template is="dom-repeat" items="{{languages.inputMethods}}"> | 80 <template is="dom-repeat" items="{{languages.inputMethods}}"> |
| 77 <div class="list-item"> | 81 <div class$= |
| 82 "list-item [[getInputMethodItemClass_(id, currentId)]]"> | |
| 78 <div class="start"> | 83 <div class="start"> |
| 79 <div>[[item.name]]</div> | 84 <div>[[item.name]]</div> |
| 80 <iron-icon icon="done" | 85 <iron-icon icon="done" |
| 81 hidden$="[[!isCurrentInputMethod_(item.id, languages.curre ntInputMethod)]]"> | 86 hidden$="[[!isCurrentInputMethod_(item.id, languages.curre ntInputMethod)]]"> |
| 82 </iron-icon> | 87 </iron-icon> |
| 83 </div> | 88 </div> |
| 84 <paper-icon-button icon="settings"></paper-icon-button> | 89 <paper-icon-button icon="settings"></paper-icon-button> |
| 85 </div> | 90 </div> |
| 86 </template> | 91 </template> |
| 87 <div class="list-item list-button" | 92 <div class="list-item list-button" |
| 88 i18n-content="manageInputMethods"> | 93 i18n-content="manageInputMethods"> |
| 89 </div> | 94 </div> |
| 90 </div> | 95 </div> |
| 91 </iron-collapse> | 96 </iron-collapse> |
| 92 </if> | 97 </if> |
| 93 <if expr="not is_macosx"> | 98 <if expr="not is_macosx"> |
| 94 <div class="settings-box two-line"> | 99 <div class="settings-box two-line"> |
| 95 <div class="start"> | 100 <div class="start"> |
| 96 <div i18n-content="spellCheckListTitle"></div> | 101 <div i18n-content="spellCheckListTitle"></div> |
| 97 <div class="secondary">[[spellCheckSecondary_]]</div> | 102 <div class="secondary">[[spellCheckSecondary_]]</div> |
| 98 </div> | 103 </div> |
| 99 <cr-expand-button expanded="{{spellCheckOpened_}}"> | 104 <cr-expand-button expanded="{{spellCheckOpened_}}"> |
| 100 </cr-expand-button> | 105 </cr-expand-button> |
| 101 </div> | 106 </div> |
| 102 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> | 107 <iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> |
| 103 <div class="list-frame vertical-list"> | 108 <div class="list-frame vertical-list"> |
| 104 <div class="list-item"> | 109 <template is="dom-repeat" |
| 105 <template is="dom-repeat" items="{{languages.enabledLanguages}}"> | 110 items="[[spellCheckLanguages_(languages.enabledLanguages.*)]]"> |
| 106 <paper-checkbox hidden="[[!item.language.supportsSpellcheck]]" | 111 <div class="list-item"> |
| 107 checked="[[item.state.spellCheckEnabled]]" | 112 <div class="start"> |
| 108 on-change="onSpellCheckChange_" | 113 <paper-checkbox |
| 109 >[[item.language.displayName]]</paper-checkbox> | 114 checked="[[item.state.spellCheckEnabled]]" |
| 110 </template> | 115 on-change="onSpellCheckChange_"> |
| 111 </div> | 116 [[item.language.displayName]] |
| 117 </paper-checkbox> | |
| 118 </div> | |
| 119 <paper-icon-button icon="settings" | |
| 120 on-tap="onShowLanguageDetailTap_"></paper-icon-button> | |
| 121 </div> | |
| 122 </template> | |
| 112 <div class="list-item list-button" i18n-content="manageSpellCheck" | 123 <div class="list-item list-button" i18n-content="manageSpellCheck" |
| 113 on-tap="onEditDictionaryTap_"> | 124 on-tap="onEditDictionaryTap_"> |
| 114 </div> | 125 </div> |
| 115 </div> | 126 </div> |
| 116 </iron-collapse> | 127 </iron-collapse> |
| 117 </if> | 128 </if> |
| 118 </neon-animatable> | 129 </neon-animatable> |
| 119 <template is="dom-if" name="manage-languages"> | 130 <template is="dom-if" name="manage-languages"> |
| 120 <settings-subpage page-title="[[i18n('manageLanguagesPageTitle')]]"> | 131 <settings-subpage page-title="[[i18n('manageLanguagesPageTitle')]]"> |
| 121 <settings-manage-languages-page | 132 <settings-manage-languages-page |
| 122 prefs="{{prefs}}"></settings-manage-languages-page> | 133 prefs="{{prefs}}"></settings-manage-languages-page> |
| 123 </settings-subpage> | 134 </settings-subpage> |
| 124 </template> | 135 </template> |
| 125 <template is="dom-if" name="language-detail"> | 136 <template is="dom-if" name="language-detail"> |
| 126 <settings-subpage | 137 <settings-subpage |
| 127 page-title="[[detailLanguage.language.displayName]]"> | 138 page-title="[[detailLanguage_.language.displayName]]"> |
| 128 <settings-language-detail-page id="languageDetailPage" | 139 <settings-language-detail-page id="languageDetailPage" |
| 129 prefs="{{prefs}}" detail="[[detailLanguage]]"> | 140 prefs="{{prefs}}" detail="[[detailLanguage_]]"> |
| 130 </settings-language-detail-page> | 141 </settings-language-detail-page> |
| 131 </settings-subpage> | 142 </settings-subpage> |
| 132 </template> | 143 </template> |
| 133 <if expr="not is_macosx"> | 144 <if expr="not is_macosx"> |
| 134 <template is="dom-if" name="edit-dictionary"> | 145 <template is="dom-if" name="edit-dictionary"> |
| 135 <settings-subpage page-title="[[i18n('editDictionaryPageTitle')]]"> | 146 <settings-subpage page-title="[[i18n('editDictionaryPageTitle')]]"> |
| 136 <settings-edit-dictionary-page></settings-edit-dictionary-page> | 147 <settings-edit-dictionary-page></settings-edit-dictionary-page> |
| 137 </settings-subpage> | 148 </settings-subpage> |
| 138 </template> | 149 </template> |
| 139 </if> | 150 </if> |
| 140 </settings-animated-pages> | 151 </settings-animated-pages> |
| 141 </template> | 152 </template> |
| 142 <script src="languages_page.js"></script> | 153 <script src="languages_page.js"></script> |
| 143 </dom-module> | 154 </dom-module> |
| OLD | NEW |