| Index: third_party/polymer/v1_0/components/paper-radio-group/paper-radio-group.html
|
| diff --git a/third_party/polymer/v1_0/components/paper-radio-group/paper-radio-group.html b/third_party/polymer/v1_0/components/paper-radio-group/paper-radio-group.html
|
| index 7960f2779ca1e516dd65320225fbf309b919e22f..d28b6d7fec475dd5c26ba6c1da802a92c73b929b 100644
|
| --- a/third_party/polymer/v1_0/components/paper-radio-group/paper-radio-group.html
|
| +++ b/third_party/polymer/v1_0/components/paper-radio-group/paper-radio-group.html
|
| @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| -->
|
|
|
| <link rel="import" href="../polymer/polymer.html">
|
| -<link rel="import" href="../iron-selector/iron-selector.html">
|
| +<link rel="import" href="../iron-selector/iron-selectable.html">
|
| <link rel="import" href="../paper-radio-button/paper-radio-button.html">
|
| <link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
|
|
|
| @@ -42,16 +42,13 @@ information about `paper-radio-button`.
|
| display: inline-block;
|
| }
|
|
|
| - iron-selector ::content > * {
|
| + :host ::content > * {
|
| padding: 12px;
|
| }
|
| </style>
|
|
|
| <template>
|
| - <iron-selector selected="{{selected}}" attr-for-selected="name"
|
| - selectable="paper-radio-button">
|
| <content id="items" select="*"></content>
|
| - </iron-selector>
|
| </template>
|
|
|
| </dom-module>
|
| @@ -61,7 +58,8 @@ information about `paper-radio-button`.
|
| is: 'paper-radio-group',
|
|
|
| behaviors: [
|
| - Polymer.IronA11yKeysBehavior
|
| + Polymer.IronA11yKeysBehavior,
|
| + Polymer.IronSelectableBehavior
|
| ],
|
|
|
| hostAttributes: {
|
| @@ -71,116 +69,76 @@ information about `paper-radio-button`.
|
|
|
| properties: {
|
| /**
|
| - * Fired when the selected element changes to user interaction.
|
| - *
|
| - * @event paper-radio-group-changed
|
| + * Overriden from Polymer.IronSelectableBehavior
|
| */
|
| + attrForSelected: {
|
| + type: String,
|
| + value: 'name'
|
| + },
|
|
|
| /**
|
| - * Gets or sets the selected element. Use the `name` attribute of the
|
| - * <paper-radio-button> that should be selected.
|
| - *
|
| - * @attribute selected
|
| - * @type String
|
| - * @default null
|
| + * Overriden from Polymer.IronSelectableBehavior
|
| */
|
| -
|
| - selected: {
|
| + selectedAttribute: {
|
| type: String,
|
| - value: null,
|
| - notify: true,
|
| - reflectToAttribute: true,
|
| - observer: "_selectedChanged"
|
| + value: 'checked'
|
| }
|
| },
|
|
|
| keyBindings: {
|
| - 'left up': '_selectPrevious',
|
| - 'right down': '_selectNext',
|
| + 'left up': 'selectPrevious',
|
| + 'right down': 'selectNext',
|
| },
|
|
|
| - _selectedChanged: function() {
|
| - // TODO: This only needs to be async while a domReady event is unavailable.
|
| - this.async(function() {
|
| - this._selectIndex(this._valueToIndex(this.items, this.selected));
|
| - this.fire('paper-radio-group-changed');
|
| - });
|
| - },
|
| + /**
|
| + * Selects the given value.
|
| + */
|
| + select: function(value) {
|
| + if (this.selected) {
|
| + var oldItem = this._valueToItem(this.selected);
|
| +
|
| + // Do not allow unchecking the selected item.
|
| + if (this.selected == value) {
|
| + oldItem.checked = true;
|
| + return;
|
| + }
|
|
|
| - _selectNext: function() {
|
| - this.selected = this._nextNode();
|
| - },
|
| + if (oldItem)
|
| + oldItem.checked = false;
|
| + }
|
|
|
| - _selectPrevious: function() {
|
| - this.selected = this._previousNode();
|
| + Polymer.IronSelectableBehavior.select.apply(this, [value]);
|
| + this.fire('paper-radio-group-changed');
|
| },
|
|
|
| /**
|
| - * Returns an array of all items.
|
| - *
|
| - * @property items
|
| - * @type array
|
| + * Selects the previous item. If the previous item is disabled, then it is
|
| + * skipped, and its previous item is selected
|
| */
|
| - get items() {
|
| - return Polymer.dom(this.$.items).getDistributedNodes();
|
| - },
|
| + selectPrevious: function() {
|
| + var length = this.items.length;
|
| + var newIndex = Number(this._valueToIndex(this.selected));
|
|
|
| - _nextNode: function() {
|
| - var items = this.items;
|
| - var index = this._selectedIndex;
|
| - var newIndex = index;
|
| do {
|
| - newIndex = (newIndex + 1) % items.length;
|
| - if (newIndex === index) {
|
| - break;
|
| - }
|
| - } while (items[newIndex].disabled);
|
| - return this._valueForNode(items[newIndex]);
|
| - },
|
| + newIndex = (newIndex - 1 + length) % length;
|
| + } while (this.items[newIndex].disabled)
|
|
|
| - _previousNode: function() {
|
| - var items = this.items;
|
| - var index = this._selectedIndex;
|
| - var newIndex = index;
|
| - do {
|
| - newIndex = (newIndex || items.length) - 1;
|
| - if (newIndex === index) {
|
| - break;
|
| - }
|
| - } while (items[newIndex].disabled);
|
| - return this._valueForNode(items[newIndex]);
|
| + this.select(this._indexToValue(newIndex));
|
| },
|
|
|
| - _selectIndex: function(index) {
|
| - if (index == this._selectedIndex)
|
| - return;
|
| -
|
| - var nodes = this.items;
|
| -
|
| - // If there was a previously selected node, deselect it.
|
| - if (nodes[this._selectedIndex]) {
|
| - nodes[this._selectedIndex].checked = false;
|
| - }
|
| + /**
|
| + * Selects the next item. If the next item is disabled, then it is
|
| + * skipped, and its nexy item is selected
|
| + */
|
| + selectNext: function() {
|
| + var length = this.items.length;
|
| + var newIndex = Number(this._valueToIndex(this.selected));
|
|
|
| - // Select a new node.
|
| - nodes[index].checked = true;
|
| - nodes[index].focus();
|
| - this._selectedIndex = index;
|
| - },
|
| + do {
|
| + newIndex = (newIndex + 1 + length) % length;
|
| + } while (this.items[newIndex].disabled)
|
|
|
| - _valueForNode: function(node) {
|
| - return node["name"] || node.getAttribute("name");
|
| + this.select(this._indexToValue(newIndex));
|
| },
|
| -
|
| - // Finds an item with value == |value| and return its index.
|
| - _valueToIndex: function(items, value) {
|
| - for (var index = 0, node; (node = items[index]); index++) {
|
| - if (this._valueForNode(node) == value) {
|
| - return index;
|
| - }
|
| - }
|
| - // If no item found, the value itself is probably the index.
|
| - return value;
|
| - }
|
| });
|
| </script>
|
|
|