Chromium Code Reviews| Index: ui/webui/resources/cr_elements/network/cr_network_select.js |
| diff --git a/ui/webui/resources/cr_elements/network/cr_network_select.js b/ui/webui/resources/cr_elements/network/cr_network_select.js |
| index ecf439385f56ff69a6631ef683e0f4062b8df36b..555a1a8ac3e1cf6f1db95c44c0a9d1066b90c595 100644 |
| --- a/ui/webui/resources/cr_elements/network/cr_network_select.js |
| +++ b/ui/webui/resources/cr_elements/network/cr_network_select.js |
| @@ -56,12 +56,56 @@ Polymer({ |
| /** |
| * List of all network state data for all visible networks. |
| + * See <cr-network-list-network-item/> for details. |
| + * |
| * @type {!Array<!CrOnc.NetworkStateProperties>} |
| */ |
| networkStateList: { |
| type: Array, |
| value: function() { return []; } |
| - } |
| + }, |
| + |
| + /** |
| + * List of custom items to display at the end of networks list. |
| + * See <cr-network-list-custom-item/> for details. |
| + * |
| + * @type {!Array<Object>} |
| + */ |
| + customItems: { |
| + type: Array, |
| + value: function() { return []; }, |
| + }, |
| + |
| + /** |
| + * Show all buttons in list items. |
| + */ |
| + showButtons: { |
| + type: Boolean, |
| + value: false, |
|
stevenjb
2016/06/24 22:33:08
nit: This could default to true, then we don't hav
|
| + }, |
| + |
| + /** |
| + * If this event name is defined, "selected" event for network list item |
| + * will trigger this event instead of <cr-network-select/> internal |
| + * handler. |
| + * |
| + * @type {Function} |
| + */ |
| + itemSelectedEventOverride: { |
|
stevenjb
2016/06/24 22:33:08
I think this should just be a boolean, e.g. 'handl
stevenjb
2016/06/27 20:09:45
How about this?
Alexander Alekseev
2016/06/28 06:51:16
Done.
|
| + type: Object, |
| + value: null, |
| + }, |
| + |
| + /** |
| + * This event is fired on each NetworkStateProperties object when it has |
| + * state 'Connected'. |
| + * |
| + * @type {String} |
| + */ |
| + networkConnectedEvent: { |
| + type: String, |
| + value: null, |
| + }, |
| }, |
| /** |
| @@ -102,7 +146,7 @@ Polymer({ |
| }, |
| /** |
| - * Polymer chnaged function. |
| + * Polymer changed function. |
| * @private |
| */ |
| networkListOpenedChanged_: function() { |
| @@ -134,14 +178,21 @@ Polymer({ |
| }, |
| /** |
| - * Event triggered when a cr-network-list-item is selected. |
| + * Event triggered when a cr-network-list-network-item is selected. |
| * @param {!{detail: !CrOnc.NetworkStateProperties}} event |
| * @private |
| */ |
| onNetworkListItemSelected_: function(event) { |
| var state = event.detail; |
| + |
| + if (this.itemSelectedEventOverride) { |
| + this.fire(this.itemSelectedEventOverride, state); |
| + return; |
| + } |
| + |
| if (state.ConnectionState != CrOnc.ConnectionState.NOT_CONNECTED) |
| return; |
| + |
| chrome.networkingPrivate.startConnect(state.GUID, function() { |
| var lastError = chrome.runtime.lastError; |
| if (lastError && lastError != 'connecting') |