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-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="/controls/pref_control_behavior.html"> | 4 <link rel="import" href="/controls/pref_control_behavior.html"> |
| 5 <link rel="import" href="/i18n_setup.html"> | 5 <link rel="import" href="/i18n_setup.html"> |
| 6 <link rel="import" href="/prefs/pref_util.html"> | 6 <link rel="import" href="/prefs/pref_util.html"> |
| 7 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
| 8 | 8 |
| 9 <dom-module id="settings-dropdown-menu"> | 9 <dom-module id="settings-dropdown-menu"> |
| 10 <template> | 10 <template> |
| 11 <style include="settings-shared"> | 11 <style include="settings-shared"> |
| 12 </style> | 12 </style> |
| 13 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]" | 13 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]" |
| 14 on-iron-select="onSelect_" no-label-float$="[[noLabelFloat]]" | 14 on-iron-select="onSelect_" no-label-float$="[[noLabelFloat]]" |
| 15 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]"> | 15 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]"> |
| 16 <paper-listbox class="dropdown-content" selected="{{selected_}}" | 16 <paper-listbox class="dropdown-content" selected="{{selected_}}" |
| 17 attr-for-selected="data-value"> | 17 attr-for-selected="data-value"> |
| 18 <template is="dom-repeat" items="[[menuOptions]]" initial-count="5"> | 18 <template is="dom-repeat" items="[[menuOptions]]" initial-count="5"> |
| 19 <!--TODO(dpapad): Use <button class="paper-item">..</button> once it | 19 <!--TODO(dpapad): Use <button class="paper-item">..</button> once it |
| 20 lands in paper-item-shared-styles.html--> | 20 lands in paper-item-shared-styles.html--> |
| 21 <div class="dropdown-item" role="option" data-value$="[[item.value]]"> | 21 <button class="dropdown-item" role="option" data-value$="[[item.value] ]"> |
|
stevenjb
2016/07/12 22:46:57
Should we change to button for all paper-dropdown-
dpapad
2016/07/12 22:56:09
I agree that we should change it to something that
Dan Beam
2016/07/12 23:00:27
80 col wrap
dpapad
2016/07/12 23:18:02
Done.
michaelpg
2016/07/12 23:44:22
wrap
dpapad
2016/07/13 01:01:07
Already done.
| |
| 22 [[item.name]] | 22 [[item.name]] |
| 23 </div> | 23 </button> |
| 24 </template> | 24 </template> |
| 25 <div class="dropdown-item" role="option" | 25 <button class="dropdown-item" role="option" |
| 26 data-value$="[[notFoundValue_]]" | 26 data-value$="[[notFoundValue_]]" |
| 27 hidden$="[[!isSelectedNotFound_(selected_)]]"> | 27 hidden$="[[!isSelectedNotFound_(selected_)]]"> |
| 28 $i18n{custom} | 28 $i18n{custom} |
| 29 </div> | 29 </button> |
| 30 </paper-listbox> | 30 </paper-listbox> |
| 31 </paper-dropdown-menu> | 31 </paper-dropdown-menu> |
| 32 </template> | 32 </template> |
| 33 <script src="settings_dropdown_menu.js"></script> | 33 <script src="settings_dropdown_menu.js"></script> |
| 34 </dom-module> | 34 </dom-module> |
| OLD | NEW |