From 85f5df55e90e47f5720b24855b48dc446ce69cec Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 30 Dec 2014 18:37:33 -0800
Subject: [PATCH] frontend more-info-light: tweaks & cleanup

---
 .../polymer/more-infos/more-info-light.html   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/http/www_static/polymer/more-infos/more-info-light.html b/homeassistant/components/http/www_static/polymer/more-infos/more-info-light.html
index 8ad2f87f6ee..6bdf858b10a 100644
--- a/homeassistant/components/http/www_static/polymer/more-infos/more-info-light.html
+++ b/homeassistant/components/http/www_static/polymer/more-infos/more-info-light.html
@@ -14,26 +14,31 @@
     .brightness paper-slider::shadow #sliderBar::shadow #activeProgress {
       background-color: #039be5;
     }
+
+    color-picker {
+      display: block;
+      width: 350px;
+      margin: 0 auto;
+    }
   </style>
   <div>
     <div center horizontal layout class='brightness'>
       <div>Brightness</div>
       <paper-slider
-        max="255" flex
-        on-core-change="{{brightnessSliderChanged}}"
-        value="{{brightnessValue}}">
+        max="255" flex id='brightness'
+        on-core-change="{{brightnessSliderChanged}}">
       </paper-slider>
     </div>
-    <color-picker id="colorpicker"
-      width="350" height="200" color="{{colorValue}}">
+    <color-picker id="colorpicker" width="350" height="200">
     </color-picker>
   </div>
 </template>
 <script>
 Polymer({
 
-  colorValue: 0,
-  brightnessValue: 0,
+  // on-change is unpredictable so using on-core-change this has side effect
+  // that it fires if changed by brightnessChanged(), thus an ignore boolean.
+  ignoreNextBrightnessEvent: false,
 
   observe: {
     'stateObj.attributes.brightness': 'brightnessChanged',
@@ -41,11 +46,9 @@ Polymer({
   },
 
   brightnessChanged: function(oldVal, newVal) {
-    this.brightnessValue = newVal;
-  },
+    this.ignoreNextBrightnessEvent = true;
 
-  colorChanged: function(oldVal, newVal) {
-    console.log(newVal);
+    this.$.brightness.value = newVal;
   },
 
   domReady: function() {
@@ -53,6 +56,11 @@ Polymer({
   },
 
   brightnessSliderChanged: function(ev, details, target) {
+    if(this.ignoreNextBrightnessEvent) {
+      this.ignoreNextBrightnessEvent = false;
+      return;
+    }
+
     var bri = parseInt(target.value);
 
     if(isNaN(bri)) return;