JS Stade model renamed entity_id to entityId

This commit is contained in:
Paulus Schoutsen 2015-02-06 00:01:29 -08:00
parent 36544ee088
commit 029379c092
6 changed files with 9 additions and 9 deletions

View File

@ -72,7 +72,7 @@
// with the state. It will be out of sync if our service call did not // with the state. It will be out of sync if our service call did not
// result in the entity to be turned on. Since the state is not changing, // result in the entity to be turned on. Since the state is not changing,
// the resync is not called automatic. // the resync is not called automatic.
window.hass.serviceActions.callTurnOn(this.stateObj.entity_id) window.hass.serviceActions.callTurnOn(this.stateObj.entityId)
.then(this.forceStateChange); .then(this.forceStateChange);
}, },
@ -81,7 +81,7 @@
// with the state. It will be out of sync if our service call did not // with the state. It will be out of sync if our service call did not
// result in the entity to be turned on. Since the state is not changing, // result in the entity to be turned on. Since the state is not changing,
// the resync is not called automatic. // the resync is not called automatic.
window.hass.serviceActions.callTurnOff(this.stateObj.entity_id) window.hass.serviceActions.callTurnOff(this.stateObj.entityId)
.then(this.forceStateChange); .then(this.forceStateChange);
}, },

View File

@ -25,7 +25,7 @@
Polymer({ Polymer({
cardClicked: function() { cardClicked: function() {
window.hass.uiActions.showMoreInfoDialog(this.stateObj.entity_id); window.hass.uiActions.showMoreInfoDialog(this.stateObj.entityId);
}, },
}); });

View File

@ -24,7 +24,7 @@
<div> <div>
<template repeat="{{state in states}}"> <template repeat="{{state in states}}">
<div class='eventContainer'> <div class='eventContainer'>
<a on-click={{handleClick}}>{{state.entity_id}}</a> <a on-click={{handleClick}}>{{state.entityId}}</a>
</div> </div>
</template> </template>

View File

@ -37,7 +37,7 @@
this.recentStates = null; this.recentStates = null;
window.hass.callApi( window.hass.callApi(
'GET', 'history/entity/' + this.stateObj.entity_id + '/recent_states').then( 'GET', 'history/entity/' + this.stateObj.entityId + '/recent_states').then(
function(states) { function(states) {
this.recentStates = states.slice(1); this.recentStates = states.slice(1);
}.bind(this)); }.bind(this));

@ -1 +1 @@
Subproject commit 68908b8dec636f9b0f87f7c929bf8546d19aa11f Subproject commit 373e96751759dfdf811c897916eef77ebc575ea4

View File

@ -85,10 +85,10 @@ Polymer({
if(isNaN(bri)) return; if(isNaN(bri)) return;
if(bri === 0) { if(bri === 0) {
window.hass.serviceActions.callTurnOff(this.stateObj.entity_id); window.hass.serviceActions.callTurnOff(this.stateObj.entityId);
} else { } else {
window.hass.serviceActions.callService("light", "turn_on", { window.hass.serviceActions.callService("light", "turn_on", {
entity_id: this.stateObj.entity_id, entity_id: this.stateObj.entityId,
brightness: bri brightness: bri
}); });
} }
@ -98,7 +98,7 @@ Polymer({
var color = ev.detail.rgb; var color = ev.detail.rgb;
window.hass.serviceActions.callService("light", "turn_on", { window.hass.serviceActions.callService("light", "turn_on", {
entity_id: this.stateObj.entity_id, entity_id: this.stateObj.entityId,
rgb_color: [color.r, color.g, color.b] rgb_color: [color.r, color.g, color.b]
}); });
} }