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

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js

Issue 1351623008: MD Settings: Languages model for language pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SingletonPrefs
Patch Set: Created 5 years, 3 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: third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js
index 9b5a4b33b280d9373c35bf4587d6175b48a72ae9..5c1031b49b8adb14464b6b93fd377de94471e03b 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js
@@ -1,6 +1,29 @@
-/** @polymerBehavior */
+
+
+ /** @polymerBehavior */
Polymer.IronSelectableBehavior = {
+ /**
+ * Fired when iron-selector is activated (selected or deselected).
+ * It is fired before the selected items are changed.
+ * Cancel the event to abort selection.
+ *
+ * @event iron-activate
+ *
+ **/
+ /**
+ * Fired when an item is selected
+ *
+ * @event iron-select
+ *
+ **/
+ /**
+ * Fired when an item is deselected
+ *
+ * @event iron-deselect
+ *
+ **/
+
properties: {
/**
@@ -54,7 +77,7 @@
},
/**
- * This is a CSS selector sting. If this is set, only items that matches the CSS selector
+ * This is a CSS selector string. If this is set, only items that match the CSS selector
* are selectable.
*
* @attribute selectable
@@ -82,18 +105,30 @@
selectedAttribute: {
type: String,
value: null
- }
+ },
+
+ /**
+ * The set of excluded elements where the key is the `localName`
+ * of the element that will be ignored from the item list.
+ *
+ * @type {object}
+ * @default {template: 1}
+ */
+ excludedLocalNames: {
+ type: Object,
+ value: function() {
+ return {
+ 'template': 1
+ };
+ }
+ }
},
observers: [
'_updateSelected(attrForSelected, selected)'
],
- excludedLocalNames: {
- 'template': 1
- },
-
created: function() {
this._bindFilterItem = this._filterItem.bind(this);
this._selection = new Polymer.IronSelection(this._applySelection.bind(this));
@@ -172,9 +207,7 @@
},
_removeListener: function(eventName) {
- // There is no unlisten yet...
- // https://github.com/Polymer/polymer/issues/1639
- //this.removeEventListener(eventName, this._bindActivateHandler);
+ this.unlisten(this, eventName, '_activateHandler');
},
_activateEventChanged: function(eventName, old) {
@@ -263,11 +296,6 @@
},
_activateHandler: function(e) {
- // TODO: remove this when https://github.com/Polymer/polymer/issues/1639 is fixed so we
- // can just remove the old event listener.
- if (e.type !== this.activateEvent) {
- return;
- }
var t = e.target;
var items = this.items;
while (t && t != this) {
@@ -288,4 +316,5 @@
}
}
- };
+ };
+

Powered by Google App Engine
This is Rietveld 408576698