mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-13 04:16:34 +00:00
Sort zwave nodes by name (#341)
This commit is contained in:
parent
6ba8338e18
commit
acd708b057
@ -324,15 +324,7 @@ Polymer({
|
||||
return (!ent.attributes.hidden &&
|
||||
(ent.entity_id).match('zwave[.]'));
|
||||
})
|
||||
.sort(function (entityA, entityB) {
|
||||
if (entityA.entity_id < entityB.entity_id) {
|
||||
return -1;
|
||||
}
|
||||
if (entityA.entity_id > entityB.entity_id) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
.sort(window.hassUtil.sortByName);
|
||||
},
|
||||
|
||||
computeEntities: function (selectedNode) {
|
||||
@ -350,17 +342,7 @@ Polymer({
|
||||
ent.attributes.node_id === nodeid &&
|
||||
(!(ent.entity_id).match('zwave[.]')));
|
||||
})
|
||||
.sort(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;
|
||||
});
|
||||
.sort(window.hassUtil.sortByName);
|
||||
},
|
||||
|
||||
selectedNodeChanged: function (selectedNode) {
|
||||
|
@ -425,6 +425,18 @@ window.hassUtil.computeStateName = function (stateObj) {
|
||||
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) {
|
||||
if (!stateObj._stateDisplay) {
|
||||
stateObj._stateDisplay = stateObj.state.replace(/_/g, ' ');
|
||||
|
Loading…
x
Reference in New Issue
Block a user