Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ui/webui/resources/cr_elements/network/cr_network_list.js

Issue 2260613003: MD Settings: Intenet: Fix network list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_638377_scrollable_behavior
Patch Set: Rebase + Feedback Created 4 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: ui/webui/resources/cr_elements/network/cr_network_list.js
diff --git a/ui/webui/resources/cr_elements/network/cr_network_list.js b/ui/webui/resources/cr_elements/network/cr_network_list.js
index 02345d55a0da3a3521d35eb5d71bc4ebcd28d7ad..43af5690d0bcbf61b95f4fe59fb2c64a5ac0585b 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_list.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_list.js
@@ -8,7 +8,6 @@
/**
* Polymer class definition for 'cr-network-list'.
- * TODO(stevenjb): Update with iron-list(?) once implemented in Polymer 1.0.
*/
Polymer({
is: 'cr-network-list',
@@ -45,12 +44,6 @@ Polymer({
}
},
- /** True if the list is opened. */
- opened: {
- type: Boolean,
- value: true,
- },
-
/** True if action buttons should be shown for the itmes. */
showButtons: {
type: Boolean,
@@ -64,8 +57,19 @@ Polymer({
value: false,
reflectToAttribute: true,
},
+
+ /**
+ * Reflects the iron-list selecteditem property.
+ * @type {!CrNetworkList.CrNetworkListItemType}
+ */
+ selectedItem: {
+ type: Object,
+ observer: 'selectedItemChanged_',
+ }
},
+ behaviors: [CrScrollableBehavior],
+
/** @private */
maxHeightChanged_: function() {
this.$.container.style.maxHeight = this.maxHeight + 'px';
@@ -85,15 +89,23 @@ Polymer({
},
/**
- * Event triggered when a list item is tapped.
- * @param {!{model: {item: !CrNetworkList.CrNetworkListItemType}}} event
+ * Use iron-list selection (which is not the same as focus) to trigger
+ * tap (requires selection-enabled) or keyboard selection.
+ * @private
+ */
+ selectedItemChanged_: function() {
+ if (this.selectedItem)
+ this.onItemAction_(this.selectedItem);
+ },
+
+ /**
+ * @param {!CrNetworkList.CrNetworkListItemType} item
* @private
*/
- onTap_: function(event) {
- let item = event.model.item;
+ onItemAction_: function(item) {
if (item.hasOwnProperty('customItemName'))
- this.fire('custom-item-selected', event.model.item);
+ this.fire('custom-item-selected', item);
else
- this.fire('selected', event.model.item);
+ this.fire('selected', item);
},
});

Powered by Google App Engine
This is Rietveld 408576698