From 714f747b617d2b08d4b519badc943acb5222635b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
Date: Tue, 4 Nov 2014 20:15:20 -0800
Subject: [PATCH] Bugfix: Sun and light state icon default colors if on work
again
---
.../http/www_static/polymer/state-badge.html | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/homeassistant/components/http/www_static/polymer/state-badge.html b/homeassistant/components/http/www_static/polymer/state-badge.html
index 3e1e8189d1c..720c9a70183 100644
--- a/homeassistant/components/http/www_static/polymer/state-badge.html
+++ b/homeassistant/components/http/www_static/polymer/state-badge.html
@@ -37,7 +37,8 @@
<div horizontal layout center>
<domain-icon id="icon"
- domain="{{stateObj.domain}}" state="{{stateObj.state}}">
+ domain="{{stateObj.domain}}" data-domain="{{stateObj.domain}}"
+ state="{{stateObj.state}}" data-state="{{stateObj.state}}">
</domain-icon>
<div fit id="picture"></div>
</div>
@@ -46,26 +47,35 @@
<script>
Polymer({
observe: {
- 'stateObj.state': 'stateChanged',
+ 'stateObj.state': 'updateIconColor',
+ 'stateObj.attributes.brightness': 'updateIconColor',
+ 'stateObj.attributes.xy_color[0]': 'updateIconColor',
+ 'stateObj.attributes.xy_color[1]': 'updateIconColor',
'stateObj.attributes.entity_picture': 'entityPictureChanged'
},
- stateChanged: function(oldVal, newVal) {
+ /**
+ * Called when an attribute changes that influences the color of the icon.
+ */
+ updateIconColor: function(oldVal, newVal) {
var state = this.stateObj;
// for domain light, set color of icon to light color if available
- if(state.domain == "light" && newVal == "on" &&
+ if(state.domain == "light" && state.state == "on" &&
state.attributes.brightness && state.attributes.xy_color) {
var rgb = this.xyBriToRgb(state.attributes.xy_color[0],
state.attributes.xy_color[1],
state.attributes.brightness);
- this.style.color = "rgb(" + rgb.map(Math.floor).join(",") + ")";
+ this.$.icon.style.color = "rgb(" + rgb.map(Math.floor).join(",") + ")";
} else {
- this.style.color = 'white';
+ this.$.icon.style.color = null;
}
},
+ /**
+ * Called when the attribute for entity_picture has changed.
+ */
entityPictureChanged: function(oldVal, newVal) {
if(newVal) {
this.$.picture.style.backgroundImage = 'url(' + newVal + ')';
--
GitLab