restore slider changes

dashboard-ui/bower_components/paper-slider/paper-slider.html

@@ -103,7 +103,7 @@ Custom property | Description | Default
             class="circle"
             hidden$="[[!receivedFocusFromKeyboard]]">
           </paper-ripple>
-          <div id="sliderKnobInner" value$="[[immediateValue]]"></div>
+          <div id="sliderKnobInner" value$="[[pinValue]]"></div>
       </div>
     </div>
 
@@ -311,6 +311,7 @@ Custom property | Description | Default
 
     _positionKnob: function(ratio) {
       this._setImmediateValue(this._calcStep(this._calcKnobPosition(ratio)));
+      this._setPinValue(this.immediateValue);
       this._setRatio(this._calcRatio(this.immediateValue));
 
       this.$.sliderKnob.style.left = (this.ratio * 100) + '%';
@@ -365,6 +366,7 @@ Custom property | Description | Default
       // update knob's position
       var translateX = ((this._calcRatio(immediateValue) * this._w) - this._startx);
       this.translate3d(translateX + 'px', 0, 0, this.$.sliderKnob);
+      this._setPinValue(immediateValue);
     },
 
     _trackEnd: function() {
@@ -477,6 +479,9 @@ Custom property | Description | Default
         this.decrement();
       }
       this.fire('change');
+    },
+    _setPinValue: function (value) {
+        this.pinValue = value;
     }
   });
 

dashboard-ui/vulcanize-out.html

@@ -16804,20 +16804,20 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
-:host(:not([disabled])) #sliderBar::shadow #activeProgress {
+:host(:not([disabled])) #sliderBar {
-  background-color: var(--paper-slider-active-color, --google-blue-700);
+  --paper-progress-active-color: var(--paper-slider-active-color, --google-blue-700);
 }
 
-:host(:not([disabled])) #sliderBar::shadow #secondaryProgress {
+:host(:not([disabled])) #sliderBar {
-  background-color: var(--paper-slider-secondary-color, --google-blue-300);
+  --paper-progress-secondary-color: var(--paper-slider-secondary-color, --google-blue-300);
 }
 
-:host([disabled]) #sliderBar::shadow #activeProgress {
+:host([disabled]) #sliderBar {
-  background-color: var(--paper-slider-disabled-active-color, --google-grey-500);
+  --paper-progress-active-color: var(--paper-slider-disabled-active-color, --google-grey-500);
 }
 
-:host([disabled]) #sliderBar::shadow #secondaryProgress {
+:host([disabled]) #sliderBar {
-  background-color: var(--paper-slider-disabled-secondary-color, --google-grey-300);
+  --paper-progress-secondary-color: var(--paper-slider-disabled-secondary-color, --google-grey-300);
 }
 
 :host(:focus) {
@@ -16901,11 +16901,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   background-color: black;
 }
 
-.transiting #sliderBar::shadow #activeProgress {
-  -webkit-transition: -webkit-transform 0.08s ease;
-  transition: transform 0.08s ease;
-}
-
 #sliderKnob {
   @apply(--layout-center-justified);
   @apply(--layout-center);
@@ -16938,10 +16933,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 #sliderKnobInner {
   width: 12px;
   height: 12px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
   border-radius: 50%;
   background-color: var(--paper-slider-knob-color, --google-blue-700);
+
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+
   transition-property: height, width, background-color, border;
   transition-duration: 0.1s;
   transition-timing-function: ease;
@@ -16950,13 +16947,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 .expand:not(.pin) > #sliderKnob > #sliderKnobInner {
   width: 100%;
   height: 100%;
+
   -webkit-transform: translateZ(0);
   transform: translateZ(0);
 }
 
 .ring > #sliderKnob > #sliderKnobInner {
-  background-color: transparent;
+  background-color: var(--paper-slider-knob-start-color, transparent);
-  border: 2px solid #c8c8c8;
+  border: 2px solid var(--paper-slider-knob-start-border-color, #c8c8c8);
 }
 
 #sliderKnobInner::before {
@@ -16972,6 +16970,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   height: 26px;
   margin-left: 3px;
   border-radius: 50% 50% 50% 0;
+
   -webkit-transform: rotate(-45deg) scale(0) translate(0);
   transform: rotate(-45deg) scale(0) translate(0);
 }
@@ -16983,7 +16982,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 }
 
 .pin.ring > #sliderKnob > #sliderKnobInner::before {
-  background-color: #c8c8c8;
+  background-color: var(--paper-slider-pin-start-color, #c8c8c8);
 }
 
 .pin.expand > #sliderKnob > #sliderKnobInner::before {
@@ -17001,6 +17000,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   text-align: center;
   color: var(--paper-slider-font-color, #fff);
   font-size: 10px;
+
   -webkit-transform: scale(0) translate(0);
   transform: scale(0) translate(0);
 }
@@ -17017,9 +17017,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   overflow: hidden;
 }
 
-.slider-input::shadow input {
+.slider-input {
-  /* FIXME(ffu): should one be able set text-align directly on paper-input? */
+  --paper-input-container-input: {
       text-align: center;
+  };
 }
 
 /* disabled state */
@@ -17047,7 +17048,7 @@ paper-ripple {
     <div id="sliderContainer" class$="[[_getClassNames(disabled, pin, snaps, immediateValue, min, expand, dragging, transiting, editable)]]">
 
       <div class="bar-container">
-                <paper-progress id="sliderBar" aria-hidden="true" min="[[min]]" max="[[max]]" step="[[step]]" value="[[immediateValue]]" secondary-progress="[[secondaryProgress]]" on-down="_bardown" on-up="_resetKnob" on-track="_onTrack">
+        <paper-progress class$="[[_getProgressClass(transiting)]]" id="sliderBar" aria-hidden="true" min="[[min]]" max="[[max]]" step="[[step]]" value="[[immediateValue]]" secondary-progress="[[secondaryProgress]]" on-down="_bardown" on-up="_resetKnob" on-track="_onTrack">
         </paper-progress>
       </div>
 
@@ -17060,13 +17061,14 @@ paper-ripple {
       </template>
 
       <div id="sliderKnob" class="center-justified center horizontal layout" on-down="_knobdown" on-up="_resetKnob" on-track="_onTrack" on-transitionend="_knobTransitionEnd">
-                <paper-ripple id="ink" class="circle" center="" hidden$="[[!receivedFocusFromKeyboard]]"></paper-ripple>
+          <paper-ripple center="" id="ink" class="circle" hidden$="[[!receivedFocusFromKeyboard]]">
+          </paper-ripple>
           <div id="sliderKnobInner" value$="[[pinValue]]"></div>
       </div>
     </div>
 
     <template is="dom-if" if="[[editable]]">
-            <paper-input id="input" class="slider-input" disabled$="[[disabled]]" on-change="_inputChange">
+      <paper-input id="input" class="slider-input" disabled$="[[disabled]]" on-change="_inputChange" value="[[_fixForInput(immediateValue)]]">
       </paper-input>
     </template>
   </template>
@@ -17079,9 +17081,8 @@ paper-ripple {
     is: 'paper-slider',
 
     behaviors: [
-          Polymer.IronA11yKeysBehavior,
-          Polymer.PaperInkyFocusBehavior,
       Polymer.IronFormElementBehavior,
+      Polymer.PaperInkyFocusBehavior,
       Polymer.IronRangeBehavior
     ],
 
@@ -17195,11 +17196,11 @@ paper-ripple {
       'right up pageup end': '_incrementKey'
     },
 
-        ready: function () {
+    ready: function() {
       // issue polymer/polymer#1305
-            this.async(function () {
+
+      this.async(function() {
         this._updateKnob(this.value);
-                this._updateInputValue();
       }, 1);
     },
 
@@ -17207,7 +17208,7 @@ paper-ripple {
      * Increases value by `step` but not above `max`.
      * @method increment
      */
-        increment: function () {
+    increment: function() {
       this.value = this._clampValue(this.value + this.step);
     },
 
@@ -17215,74 +17216,72 @@ paper-ripple {
      * Decreases value by `step` but not below `min`.
      * @method decrement
      */
-        decrement: function () {
+    decrement: function() {
       this.value = this._clampValue(this.value - this.step);
     },
 
-        _updateKnob: function (value) {
+    _updateKnob: function(value) {
       this._positionKnob(this._calcRatio(value));
     },
 
-        _minChanged: function () {
+    _minChanged: function() {
       this.setAttribute('aria-valuemin', this.min);
     },
 
-        _maxChanged: function () {
+    _maxChanged: function() {
       this.setAttribute('aria-valuemax', this.max);
     },
 
-        _valueChanged: function () {
+    _valueChanged: function() {
       this.setAttribute('aria-valuenow', this.value);
       this.fire('value-change');
     },
 
-        _immediateValueChanged: function () {
+    _immediateValueChanged: function() {
       if (this.dragging) {
         this.fire('immediate-value-change');
       } else {
         this.value = this.immediateValue;
       }
-            this._updateInputValue();
     },
 
-        _secondaryProgressChanged: function () {
+    _secondaryProgressChanged: function() {
       this.secondaryProgress = this._clampValue(this.secondaryProgress);
     },
 
-        _updateInputValue: function () {
+    _fixForInput: function(immediateValue) {
-            if (this.editable) {
+      // paper-input/issues/114
-                this.$$('#input').value = this.immediateValue.toString();
+      return this.immediateValue.toString();
-            }
     },
 
-        _expandKnob: function () {
+    _expandKnob: function() {
       this._setExpand(true);
     },
 
-        _resetKnob: function () {
+    _resetKnob: function() {
       this.cancelDebouncer('expandKnob');
       this._setExpand(false);
     },
 
-        _positionKnob: function (ratio) {
+    _positionKnob: function(ratio) {
       this._setImmediateValue(this._calcStep(this._calcKnobPosition(ratio)));
       this._setPinValue(this.immediateValue);
-
       this._setRatio(this._calcRatio(this.immediateValue));
 
       this.$.sliderKnob.style.left = (this.ratio * 100) + '%';
     },
 
-        _inputChange: function () {
+    _inputChange: function() {
       this.value = this.$$('#input').value;
       this.fire('change');
     },
 
-        _calcKnobPosition: function (ratio) {
+    _calcKnobPosition: function(ratio) {
       return (this.max - this.min) * ratio + this.min;
     },
 
-        _onTrack: function (event) {
+    _onTrack: function(event) {
+      event.stopPropagation();
       switch (event.detail.state) {
         case 'start':
           this._trackStart(event);
@@ -17296,18 +17295,18 @@ paper-ripple {
       }
     },
 
-        _trackStart: function (event) {
+    _trackStart: function(event) {
       this._w = this.$.sliderBar.offsetWidth;
       this._x = this.ratio * this._w;
       this._startx = this._x || 0;
-            this._minx = -this._startx;
+      this._minx = - this._startx;
       this._maxx = this._w - this._startx;
       this.$.sliderKnob.classList.add('dragging');
 
       this._setDragging(true);
     },
 
-        _trackX: function (e) {
+    _trackX: function(e) {
       if (!this.dragging) {
         this._trackStart(e);
       }
@@ -17317,14 +17316,14 @@ paper-ripple {
 
       var immediateValue = this._calcStep(this._calcKnobPosition(this._x / this._w));
       this._setImmediateValue(immediateValue);
-            this._setPinValue(immediateValue);
 
       // update knob's position
       var translateX = ((this._calcRatio(immediateValue) * this._w) - this._startx);
       this.translate3d(translateX + 'px', 0, 0, this.$.sliderKnob);
+      this._setPinValue(immediateValue);
     },
 
-        _trackEnd: function () {
+    _trackEnd: function() {
       var s = this.$.sliderKnob.style;
 
       this.$.sliderKnob.classList.remove('dragging');
@@ -17337,17 +17336,17 @@ paper-ripple {
       this.fire('change');
     },
 
-        _knobdown: function (event) {
+    _knobdown: function(event) {
       this._expandKnob();
 
       // cancel selection
-            event.detail.sourceEvent.preventDefault();
+      event.preventDefault();
 
       // set the focus manually because we will called prevent default
       this.focus();
     },
 
-        _bardown: function (event) {
+    _bardown: function(event) {
       this._w = this.$.sliderBar.offsetWidth;
       var rect = this.$.sliderBar.getBoundingClientRect();
       var ratio = (event.detail.x - rect.left) / this._w;
@@ -17367,21 +17366,21 @@ paper-ripple {
         this._setTransiting(false);
       }
 
-            this.async(function () {
+      this.async(function() {
         this.fire('change');
       });
 
       // cancel selection
-            event.detail.sourceEvent.preventDefault();
+      event.preventDefault();
     },
 
-        _knobTransitionEnd: function (event) {
+    _knobTransitionEnd: function(event) {
       if (event.target === this.$.sliderKnob) {
         this._setTransiting(false);
       }
     },
 
-        _maxMarkersChanged: function (maxMarkers) {
+    _maxMarkersChanged: function(maxMarkers) {
       var l = (this.max - this.min) / this.step;
       if (!this.snaps && l > maxMarkers) {
         this._setMarkers([]);
@@ -17390,7 +17389,14 @@ paper-ripple {
       }
     },
 
-        _getClassNames: function () {
+    _mergeClasses: function(classes) {
+      return Object.keys(classes).filter(
+        function(className) {
+          return classes[className];
+        }).join(' ');
+    },
+
+    _getClassNames: function() {
       var classes = {};
 
       classes.disabled = this.disabled;
@@ -17402,13 +17408,16 @@ paper-ripple {
       classes.transiting = this.transiting;
       classes.editable = this.editable;
 
-            return Object.keys(classes).filter(
+      return this._mergeClasses(classes);
-              function (className) {
-                  return classes[className];
-              }).join(' ');
     },
 
-        _incrementKey: function (event) {
+    _getProgressClass: function() {
+      return this._mergeClasses({
+        transiting: this.transiting
+      });
+    },
+
+    _incrementKey: function(event) {
       if (event.detail.key === 'end') {
         this.value = this.max;
       } else {
@@ -17417,7 +17426,7 @@ paper-ripple {
       this.fire('change');
     },
 
-        _decrementKey: function (event) {
+    _decrementKey: function(event) {
       if (event.detail.key === 'home') {
         this.value = this.min;
       } else {
@@ -17425,7 +17434,6 @@ paper-ripple {
       }
       this.fire('change');
     },
-
     _setPinValue: function (value) {
         this.pinValue = value;
     }