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

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js

Issue 1221923003: Update bower.json for Polymer elements and add PRESUBMIT.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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/paper-slider/paper-slider-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
index b50d22fc69f6b189fa6a95f86ef84f9a559d6bad..bf973c7e26db0e421d7954ebaaf308fe66fa79ce 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js
@@ -1,36 +1,17 @@
- /**
- * Fired when the slider's value changes.
- *
- * @event value-change
- */
-
- /**
- * Fired when the slider's immediateValue changes.
- *
- * @event immediate-value-change
- */
-
- /**
- * Fired when the slider's value changes due to user interaction.
- *
- * Changes to the slider's value due to changes in an underlying
- * bound variable will not trigger this event.
- *
- * @event change
- */
Polymer({
is: 'paper-slider',
behaviors: [
- Polymer.IronRangeBehavior,
Polymer.IronA11yKeysBehavior,
+ Polymer.PaperInkyFocusBehavior,
Polymer.IronFormElementBehavior,
- Polymer.PaperInkyFocusBehavior
+ Polymer.IronRangeBehavior
],
properties: {
+
/**
* If true, the slider thumb snaps to tick marks evenly spaced based
* on the `step` property value.
@@ -141,7 +122,6 @@
ready: function() {
// issue polymer/polymer#1305
-
this.async(function() {
this._updateKnob(this.value);
this._updateInputValue();
@@ -201,14 +181,12 @@
},
_expandKnob: function() {
- this.$.ink.holdDown = false;
this._setExpand(true);
},
_resetKnob: function() {
this.cancelDebouncer('expandKnob');
this._setExpand(false);
- this.$.ink.hidden = true;
},
_positionKnob: function(ratio) {
@@ -292,10 +270,6 @@
},
_bardown: function(event) {
- this.$.ink.hidden = true;
-
- event.preventDefault();
-
this._w = this.$.sliderBar.offsetWidth;
var rect = this.$.sliderBar.getBoundingClientRect();
var ratio = (event.detail.x - rect.left) / this._w;
@@ -373,4 +347,26 @@
}
this.fire('change');
}
- })
+ });
+
+ /**
+ * Fired when the slider's value changes.
+ *
+ * @event value-change
+ */
+
+ /**
+ * Fired when the slider's immediateValue changes.
+ *
+ * @event immediate-value-change
+ */
+
+ /**
+ * Fired when the slider's value changes due to user interaction.
+ *
+ * Changes to the slider's value due to changes in an underlying
+ * bound variable will not trigger this event.
+ *
+ * @event change
+ */
+

Powered by Google App Engine
This is Rietveld 408576698