jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-06-23 10:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nested group more info (#788)

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-01-07 13:25:10 -08:00 committed by GitHub
parent ea16ebd4f0
commit 7231976af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/more-infos/more-info-group.html
View File

@ -66,33 +66,31 @@ class MoreInfoGroup extends Polymer.Element {
} }
statesChanged(stateObj, states) { statesChanged(stateObj, states) {
var groupDomainStateObj = false; let groupDomainStateObj = false;
var baseStateObj;
var i;
var state;
var el;
if (states && states.length > 0) { if (states && states.length > 0) {
baseStateObj = states.find(s => s.state === 'on') || states[0]; const baseStateObj = states.find(s => s.state === 'on') || states[0];
const groupDomain = window.hassUtil.computeDomain(baseStateObj);
// Groups need to be filtered out or we'll show content of
// first child above the children of the current group
if (groupDomain !== 'group') {
groupDomainStateObj = Object.assign({}, baseStateObj, { groupDomainStateObj = Object.assign({}, baseStateObj, {
entity_id: stateObj.entity_id, entity_id: stateObj.entity_id,
attributes: Object.assign({}, baseStateObj.attributes) attributes: Object.assign({}, baseStateObj.attributes)
}); });
var groupDomain = window.hassUtil.computeDomain(groupDomainStateObj);
for (i = 0; i < states.length; i++) { for (let i = 0; i < states.length; i++) {
state = states[i]; if (groupDomain !== window.hassUtil.computeDomain(states[i])) {
if (groupDomain !== window.hassUtil.computeDomain(state)) {
groupDomainStateObj = false; groupDomainStateObj = false;
break; break;
} }
} }
} }
}
if (!groupDomainStateObj) { if (!groupDomainStateObj) {
el = Polymer.dom(this.$.groupedControlDetails); const el = Polymer.dom(this.$.groupedControlDetails);
if (el.lastChild) { if (el.lastChild) {
el.removeChild(el.lastChild); el.removeChild(el.lastChild);
} }