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

Bug fixes

Browse Source
This commit is contained in:
Paulus Schoutsen 2017-08-09 00:34:18 -07:00
parent f02d42d79c
commit a51b9c1eb5
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/editor/automation.js
View File

@ -78,22 +78,21 @@ export default class Automation extends Component {
<Trigger trigger={trigger} onChange={this.triggerChanged} /> <Trigger trigger={trigger} onChange={this.triggerChanged} />
</ha-config-section> </ha-config-section>
{ condition && <ha-config-section is-wide={isWide}>
<ha-config-section is-wide={isWide}> <span slot='header'>Conditions</span>
<span slot='header'>Conditions</span> <span slot='introduction'>
<span slot='introduction'> Conditions are an optional part of an automation rule and can be used to prevent
Conditions are an optional part of an automation rule and can be used to prevent an action from happening when triggered. Conditions look very similar to triggers
an action from happening when triggered. Conditions look very similar to triggers but are very different. A trigger will look at events happening in the system
but are very different. A trigger will look at events happening in the system while a condition only looks at how the system looks right now. A trigger can
while a condition only looks at how the system looks right now. A trigger can observe that a switch is being turned on. A condition can only see if a switch
observe that a switch is being turned on. A condition can only see if a switch is currently on or off.
is currently on or off. <p><a href="https://home-assistant.io/docs/scripts/conditions/" target="_blank">
<p><a href="https://home-assistant.io/docs/scripts/conditions/" target="_blank"> Learn more about conditions.
Learn more about conditions. </a></p>
</a></p> </span>
</span> <Condition condition={condition} onChange={this.conditionChanged} />
<Condition condition={condition} onChange={this.conditionChanged} /> </ha-config-section>
</ha-config-section>}
<ha-config-section is-wide={isWide}> <ha-config-section is-wide={isWide}>
<span slot='header'>Action</span> <span slot='header'>Action</span>

2
js/editor/condition/sun.js
View File

@ -15,7 +15,7 @@ export default class SunCondition extends Component {
const condition = { ...this.props.condition }; const condition = { ...this.props.condition };
if (ev.target.selected) { if (ev.target.selected) {
condition[key] = ev.target.value; condition[key] = ev.target.selected;
} else { } else {
delete condition[key]; delete condition[key];
} }

3
panels/config/automation/ha-automation-editor.html
View File

@ -216,6 +216,7 @@ Polymer({
trigger: [ trigger: [
{ platform: 'state' }, { platform: 'state' },
], ],
condition: [],
action: [ action: [
{ service: '' }, { service: '' },
], ],
@ -253,7 +254,7 @@ Polymer({
this.dirty = false; this.dirty = false;
if (this.creatingNew) { if (this.creatingNew) {
history.pushState(null, null, '/automation/edit/' + id); history.replaceState(null, null, '/config/automation/edit/' + id);
this.fire('location-changed'); this.fire('location-changed');
} }
}.bind(this), function (errors) { }.bind(this), function (errors) {