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/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 27 matching lines...) Expand all Loading... | |
| 38 [[getProspectiveUILanguageName_( | 38 [[getProspectiveUILanguageName_( |
| 39 languages, prefs.intl.app_locale.value)]] | 39 languages, prefs.intl.app_locale.value)]] |
| 40 </div> | 40 </div> |
| 41 </div> | 41 </div> |
| 42 <cr-expand-button expanded="{{languagesOpened_}}"> | 42 <cr-expand-button expanded="{{languagesOpened_}}"> |
| 43 </cr-expand-button> | 43 </cr-expand-button> |
| 44 </div> | 44 </div> |
| 45 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> | 45 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> |
| 46 <div class="list-frame vertical-list"> | 46 <div class="list-frame vertical-list"> |
| 47 <template is="dom-repeat" items="[[languages.enabled]]"> | 47 <template is="dom-repeat" items="[[languages.enabled]]"> |
| 48 <div class$="list-item [[getLanguageItemClass_( | 48 <div class$="list-item [[getLanguageItemClass_( |
|
dpapad
2016/06/23 22:07:45
Similarly to menu-item, this could be done as foll
Dan Beam
2016/06/23 23:31:49
there's nothing about being an item in a list that
| |
| 49 item.language.code, prefs.intl.app_locale.value)]]" | 49 item.language.code, prefs.intl.app_locale.value)]]" |
| 50 on-tap="onLanguageTap_"> | 50 on-tap="onLanguageTap_" actionable> |
| 51 <if expr="not chromeos and not is_win"> | 51 <if expr="not chromeos and not is_win"> |
| 52 <div class="start" title="[[item.language.nativeDisplayName]]"> | 52 <div class="start" title="[[item.language.nativeDisplayName]]"> |
| 53 [[item.language.displayName]] | 53 [[item.language.displayName]] |
| 54 </div> | 54 </div> |
| 55 </if> | 55 </if> |
| 56 <if expr="chromeos or is_win"> | 56 <if expr="chromeos or is_win"> |
| 57 <div title="[[item.language.nativeDisplayName]]"> | 57 <div title="[[item.language.nativeDisplayName]]"> |
| 58 [[item.language.displayName]] | 58 [[item.language.displayName]] |
| 59 </div> | 59 </div> |
| 60 <div class="middle"> | 60 <div class="middle"> |
| 61 <iron-icon icon="settings:done" | 61 <iron-icon icon="settings:done" |
| 62 hidden$="[[!isProspectiveUILanguage_( | 62 hidden$="[[!isProspectiveUILanguage_( |
| 63 item.language.code, prefs.intl.app_locale.value)]]"> | 63 item.language.code, prefs.intl.app_locale.value)]]"> |
| 64 </iron-icon> | 64 </iron-icon> |
| 65 </div> | 65 </div> |
| 66 </if> | 66 </if> |
| 67 <paper-icon-button icon="cr:settings" | 67 <paper-icon-button icon="cr:settings" |
| 68 on-tap="onShowLanguageDetailTap_"></paper-icon-button> | 68 on-tap="onShowLanguageDetailTap_"></paper-icon-button> |
| 69 </div> | 69 </div> |
| 70 </template> | 70 </template> |
| 71 <div class="list-item list-button" on-tap="onManageLanguagesTap_"> | 71 <div class="list-item list-button" on-tap="onManageLanguagesTap_" |
| 72 actionable> | |
| 72 $i18n{manageLanguages} | 73 $i18n{manageLanguages} |
| 73 </div> | 74 </div> |
| 74 </div> | 75 </div> |
| 75 </iron-collapse> | 76 </iron-collapse> |
| 76 <if expr="chromeos"> | 77 <if expr="chromeos"> |
| 77 <div class="settings-box two-line"> | 78 <div class="settings-box two-line"> |
| 78 <div class="start"> | 79 <div class="start"> |
| 79 <div>$i18n{inputMethodsListTitle}</div> | 80 <div>$i18n{inputMethodsListTitle}</div> |
| 80 <div class="secondary"> | 81 <div class="secondary"> |
| 81 [[getInputMethodName_(languages.inputMethods.currentId)]] | 82 [[getInputMethodName_(languages.inputMethods.currentId)]] |
| 82 </div> | 83 </div> |
| 83 </div> | 84 </div> |
| 84 <cr-expand-button expanded="{{inputMethodsOpened_}}"> | 85 <cr-expand-button expanded="{{inputMethodsOpened_}}"> |
| 85 </cr-expand-button> | 86 </cr-expand-button> |
| 86 </div> | 87 </div> |
| 87 <iron-collapse id="inputMethodsCollapse" | 88 <iron-collapse id="inputMethodsCollapse" |
| 88 opened="[[inputMethodsOpened_]]"> | 89 opened="[[inputMethodsOpened_]]"> |
| 89 <div class="list-frame vertical-list"> | 90 <div class="list-frame vertical-list"> |
| 90 <template is="dom-repeat" | 91 <template is="dom-repeat" |
| 91 items="[[languages.inputMethods.enabled]]"> | 92 items="[[languages.inputMethods.enabled]]"> |
| 92 <div class$="list-item [[getInputMethodItemClass_( | 93 <div class$="list-item [[getInputMethodItemClass_( |
| 93 item.id, languages.inputMethods.currentId)]]" | 94 item.id, languages.inputMethods.currentId)]]" |
| 94 on-tap="onInputMethodTap_"> | 95 on-tap="onInputMethodTap_" actionable> |
| 95 <div>[[item.displayName]]</div> | 96 <div>[[item.displayName]]</div> |
| 96 <div class="middle"> | 97 <div class="middle"> |
| 97 <iron-icon icon="settings:done" | 98 <iron-icon icon="settings:done" |
| 98 hidden$="[[!isCurrentInputMethod_( | 99 hidden$="[[!isCurrentInputMethod_( |
| 99 item.id, languages.inputMethods.currentId)]]"> | 100 item.id, languages.inputMethods.currentId)]]"> |
| 100 </iron-icon> | 101 </iron-icon> |
| 101 </div> | 102 </div> |
| 102 <paper-icon-button icon="cr:settings" | 103 <paper-icon-button icon="cr:settings" |
| 103 on-tap="onInputMethodOptionsTap_" | 104 on-tap="onInputMethodOptionsTap_" |
| 104 hidden$="[[!item.hasOptionsPage]]"> | 105 hidden$="[[!item.hasOptionsPage]]"> |
| 105 </paper-icon-button> | 106 </paper-icon-button> |
| 106 </div> | 107 </div> |
| 107 </template> | 108 </template> |
| 108 <div class="list-item list-button" | 109 <div class="list-item list-button" actionable |
| 109 on-tap="onManageInputMethodsTap_"> | 110 on-tap="onManageInputMethodsTap_"> |
| 110 $i18n{manageInputMethods} | 111 $i18n{manageInputMethods} |
| 111 </div> | 112 </div> |
| 112 </div> | 113 </div> |
| 113 </iron-collapse> | 114 </iron-collapse> |
| 114 </if> | 115 </if> |
| 115 <if expr="not is_macosx"> | 116 <if expr="not is_macosx"> |
| 116 <div class="settings-box two-line"> | 117 <div class="settings-box two-line"> |
| 117 <div class="start"> | 118 <div class="start"> |
| 118 <div>$i18n{spellCheckListTitle}</div> | 119 <div>$i18n{spellCheckListTitle}</div> |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 135 </label> | 136 </label> |
| 136 <paper-toggle-button | 137 <paper-toggle-button |
| 137 checked="[[item.spellCheckEnabled]]" | 138 checked="[[item.spellCheckEnabled]]" |
| 138 on-change="onSpellCheckChange_" | 139 on-change="onSpellCheckChange_" |
| 139 disabled$="[[!item.language.supportsSpellcheck]]" | 140 disabled$="[[!item.language.supportsSpellcheck]]" |
| 140 aria-labelledby= | 141 aria-labelledby= |
| 141 "supportsSpellCheckLabel-[[item.language.code]]"> | 142 "supportsSpellCheckLabel-[[item.language.code]]"> |
| 142 </paper-toggle-button> | 143 </paper-toggle-button> |
| 143 </label> | 144 </label> |
| 144 </template> | 145 </template> |
| 145 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> | 146 <div class="list-item list-button" on-tap="onEditDictionaryTap_" |
| 147 actionable> | |
| 146 $i18n{manageSpellCheck} | 148 $i18n{manageSpellCheck} |
| 147 </div> | 149 </div> |
| 148 </div> | 150 </div> |
| 149 </iron-collapse> | 151 </iron-collapse> |
| 150 </if> | 152 </if> |
| 151 </neon-animatable> | 153 </neon-animatable> |
| 152 <template is="dom-if" name="manage-languages"> | 154 <template is="dom-if" name="manage-languages"> |
| 153 <settings-subpage page-title="$i18n{manageLanguagesPageTitle}"> | 155 <settings-subpage page-title="$i18n{manageLanguagesPageTitle}"> |
| 154 <settings-manage-languages-page | 156 <settings-manage-languages-page |
| 155 prefs="{{prefs}}"></settings-manage-languages-page> | 157 prefs="{{prefs}}"></settings-manage-languages-page> |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 175 <template is="dom-if" name="edit-dictionary"> | 177 <template is="dom-if" name="edit-dictionary"> |
| 176 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> | 178 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> |
| 177 <settings-edit-dictionary-page></settings-edit-dictionary-page> | 179 <settings-edit-dictionary-page></settings-edit-dictionary-page> |
| 178 </settings-subpage> | 180 </settings-subpage> |
| 179 </template> | 181 </template> |
| 180 </if> | 182 </if> |
| 181 </settings-animated-pages> | 183 </settings-animated-pages> |
| 182 </template> | 184 </template> |
| 183 <script src="languages_page.js"></script> | 185 <script src="languages_page.js"></script> |
| 184 </dom-module> | 186 </dom-module> |
| OLD | NEW |