Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-s hared-styles.html"> | |
|
michaelpg
2016/06/29 19:49:14
alphabetize
dpapad
2016/06/29 20:50:08
Done.
| |
| 5 <link rel="import" href="/controls/pref_control_behavior.html"> | 5 <link rel="import" href="/controls/pref_control_behavior.html"> |
| 6 <link rel="import" href="/i18n_setup.html"> | 6 <link rel="import" href="/i18n_setup.html"> |
| 7 <link rel="import" href="/prefs/pref_util.html"> | 7 <link rel="import" href="/prefs/pref_util.html"> |
| 8 <link rel="import" href="/settings_shared_css.html"> | 8 <link rel="import" href="/settings_shared_css.html"> |
| 9 | 9 |
| 10 <dom-module id="settings-dropdown-menu"> | 10 <dom-module id="settings-dropdown-menu"> |
| 11 <template> | 11 <template> |
| 12 <style include="settings-shared"> | 12 <style include="settings-shared paper-item-shared-styles"> |
| 13 paper-item { | 13 .paper-item { |
| 14 color: var(--paper-grey-800); | 14 color: var(--paper-grey-800); |
| 15 font-size: inherit; | 15 font-size: inherit; |
| 16 } | 16 } |
| 17 | 17 |
| 18 paper-dropdown-menu { | 18 paper-dropdown-menu { |
| 19 --iron-icon-fill-color: var(--paper-grey-600); | 19 --iron-icon-fill-color: var(--paper-grey-600); |
| 20 --paper-font-subhead: { | 20 --paper-font-subhead: { |
| 21 font-size: inherit; | 21 font-size: inherit; |
| 22 }; | 22 }; |
| 23 --paper-input-container-underline: { | 23 --paper-input-container-underline: { |
| 24 background: var(--paper-grey-300); | 24 background: var(--paper-grey-300); |
| 25 }; | 25 }; |
| 26 width: 160px; | 26 width: 160px; |
| 27 } | 27 } |
| 28 </style> | 28 </style> |
| 29 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]" | 29 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]" |
| 30 on-iron-select="onSelect_" no-label-float$="[[noLabelFloat]]" | 30 on-iron-select="onSelect_" no-label-float$="[[noLabelFloat]]" |
| 31 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]"> | 31 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]"> |
| 32 <paper-listbox class="dropdown-content" selected="{{selected_}}" | 32 <paper-listbox class="dropdown-content" selected="{{selected_}}" |
| 33 attr-for-selected="data-value"> | 33 attr-for-selected="data-value"> |
| 34 <template is="dom-repeat" items="[[menuOptions]]"> | 34 <template is="dom-repeat" items="[[menuOptions]]" item-count="5"> |
| 35 <paper-item data-value$="[[item.value]]">[[item.name]]</paper-item> | 35 <button class="paper-item" |
|
michaelpg
2016/06/29 19:49:14
the docs suggest including role="option". i assume
dpapad
2016/06/29 20:50:08
Done, just forgot about it.
| |
| 36 data-value$="[[item.value]]">[[item.name]]</button> | |
|
michaelpg
2016/06/29 19:49:14
4-space indent
nit: line break after > and before
dpapad
2016/06/29 20:50:08
Fixed.
| |
| 36 </template> | 37 </template> |
| 37 <paper-item data-value$="[[notFoundValue_]]" | 38 <button class="paper-item" data-value$="[[notFoundValue_]]" |
| 38 hidden$="[[!isSelectedNotFound_(selected_)]]"> | 39 hidden$="[[!isSelectedNotFound_(selected_)]]"> |
| 39 $i18n{custom} | 40 $i18n{custom} |
| 40 </paper-item> | 41 </button> |
| 41 </paper-listbox> | 42 </paper-listbox> |
| 42 </paper-dropdown-menu> | 43 </paper-dropdown-menu> |
| 43 </template> | 44 </template> |
| 44 <script src="settings_dropdown_menu.js"></script> | 45 <script src="settings_dropdown_menu.js"></script> |
| 45 </dom-module> | 46 </dom-module> |
| OLD | NEW |