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

Sort zwave nodes by name (#341)

Browse Source
This commit is contained in:
Andrey 2017-07-16 17:58:09 +03:00 committed by Paulus Schoutsen
parent 6ba8338e18
commit acd708b057
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panels/zwave/ha-panel-zwave.html
View File

@ -324,15 +324,7 @@ Polymer({
return (!ent.attributes.hidden && return (!ent.attributes.hidden &&
(ent.entity_id).match('zwave[.]')); (ent.entity_id).match('zwave[.]'));
}) })
.sort(function (entityA, entityB) { .sort(window.hassUtil.sortByName);
if (entityA.entity_id < entityB.entity_id) {
return -1;
}
if (entityA.entity_id > entityB.entity_id) {
return 1;
}
return 0;
});
}, },
computeEntities: function (selectedNode) { computeEntities: function (selectedNode) {
@ -350,17 +342,7 @@ Polymer({
ent.attributes.node_id === nodeid && ent.attributes.node_id === nodeid &&
(!(ent.entity_id).match('zwave[.]'))); (!(ent.entity_id).match('zwave[.]')));
}) })
.sort(function (entityA, entityB) { .sort(window.hassUtil.sortByName);
var nameA = window.hassUtil.computeStateName(entityA);
var nameB = window.hassUtil.computeStateName(entityB);
if (nameA < nameB) {
return -1;
}
if (nameA > nameB) {
return 1;
}
return 0;
});
}, },
selectedNodeChanged: function (selectedNode) { selectedNodeChanged: function (selectedNode) {

12
src/util/hass-util.html
View File

@ -425,6 +425,18 @@ window.hassUtil.computeStateName = function (stateObj) {
return stateObj._entityDisplay; return stateObj._entityDisplay;
}; };
window.hassUtil.sortByName = function (entityA, entityB) {
var nameA = window.hassUtil.computeStateName(entityA);
var nameB = window.hassUtil.computeStateName(entityB);
if (nameA < nameB) {
return -1;
}
if (nameA > nameB) {
return 1;
}
return 0;
};
window.hassUtil.computeStateState = function (stateObj) { window.hassUtil.computeStateState = function (stateObj) {
if (!stateObj._stateDisplay) { if (!stateObj._stateDisplay) {
stateObj._stateDisplay = stateObj.state.replace(/_/g, ' '); stateObj._stateDisplay = stateObj.state.replace(/_/g, ' ');