chrome/browser/resources/settings/controls/settings_dropdown_menu.html - Issue 1420533011: [MD settings] change dropdown to accept array of objects rather than array of tuples

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/settings/controls/settings_dropdown_menu.html

Issue 1420533011: [MD settings] change dropdown to accept array of objects rather than array of tuples (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@appearance50p

Patch Set: trybot fix Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/controls/compiled_resources.gyp ('k') | chrome/browser/resources/settings/controls/settings_dropdown_menu.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/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">	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-menu/paper-menu.h tml">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">

5 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	5 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

6 <link rel="import" href="chrome://md-settings/prefs/pref_util.html">	6 <link rel="import" href="chrome://md-settings/prefs/pref_util.html">

7	7

8 <dom-module id="settings-dropdown-menu">	8 <dom-module id="settings-dropdown-menu">

9 <link rel="import" type="css"	9 <link rel="import" type="css"

10 href="chrome://md-settings/settings_page/settings_page.css">	10 href="chrome://md-settings/settings_page/settings_page.css">

11 <template>	11 <template>

12 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]"	12 <paper-dropdown-menu id="dropdownMenu" label="[[menuLabel_]]"

13 on-iron-select="onSelect_"	13 on-iron-select="onSelect_"

14 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]">	14 disabled="[[shouldDisableMenu_(disabled, menuOptions.*)]]">

15 <paper-menu class="dropdown-content" selected="{{selected_}}"	15 <paper-menu class="dropdown-content" selected="{{selected_}}"

16 attr-for-selected="data-value">	16 attr-for-selected="data-value">

17 <template is="dom-repeat" items="[[menuOptions]]">	17 <template is="dom-repeat" items="[[menuOptions]]">

18 <paper-item data-value$="[[item.0]]">[[item.1]]</paper-item>	18 <paper-item data-value$="[[item.value]]">[[item.name]]</paper-item>

19 </template>	19 </template>

20 <paper-item data-value$="[[notFoundValue_]]"	20 <paper-item data-value$="[[notFoundValue_]]"

21 hidden$="[[!isSelectedNotFound_(selected_)]]">	21 hidden$="[[!isSelectedNotFound_(selected_)]]">

22 [[i18n('custom')]]	22 [[i18n('custom')]]

23 </paper-item>	23 </paper-item>

24 </paper-menu>	24 </paper-menu>

25 </paper-dropdown-menu>	25 </paper-dropdown-menu>

26 </template>	26 </template>

27 <script src="settings_dropdown_menu.js"></script>	27 <script src="settings_dropdown_menu.js"></script>

28 </dom-module>	28 </dom-module>

OLD	NEW