From 7b8ba2ce4d3a0db48796a3b6621f23dcd527a849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Sandstr=C3=B6m?= Date: Wed, 16 Sep 2015 21:13:09 +0200 Subject: [PATCH 1/2] hide unusable buttons --- .../more-info-alarm_control_panel.html | 6 ++--- .../more-info-alarm_control_panel.js | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html index 512b529b6f..e721cca8a2 100644 --- a/src/more-infos/more-info-alarm_control_panel.html +++ b/src/more-infos/more-info-alarm_control_panel.html @@ -9,9 +9,9 @@
- Disarm - Arm Home - Arm Away + Disarm + Arm Home + Arm Away
diff --git a/src/more-infos/more-info-alarm_control_panel.js b/src/more-infos/more-info-alarm_control_panel.js index 80772b0279..f8d45bf4bf 100644 --- a/src/more-infos/more-info-alarm_control_panel.js +++ b/src/more-infos/more-info-alarm_control_panel.js @@ -14,14 +14,39 @@ export default new Polymer({ this.callService('alarm_arm_away', {code: this.entered_code}); }, properties: { + stateObj: { + type: Object, + observer: 'stateObjChanged', + }, entered_code: { type: String, value: '', }, + disarm_button_enabled: { + type: Boolean, + value: false, + }, + arm_home_button_enabled: { + type: Boolean, + value: false, + }, + arm_away_button_enabled: { + type: Boolean, + value: false, + }, }, enteredCodeChanged(ev) { this.entered_code = ev.target.value; }, + stateObjChanged(newVal) { + if (newVal) { + this.disarm_button_enabled = newVal.state === 'armed_home' || newVal.state ==='armed_away'; + this.arm_home_button_enabled = newVal.state === 'disarmed'; + this.arm_away_button_enabled = newVal.state === 'disarmed'; + } + + this.async(() => this.fire('iron-resize'), 500); + }, callService(service, data) { const serviceData = data || {}; serviceData.entity_id = this.stateObj.entityId; From db59a0a94e842fd6a78bdef47189a4ed238136ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Sandstr=C3=B6m?= Date: Wed, 16 Sep 2015 21:37:47 +0200 Subject: [PATCH 2/2] fix lint --- src/more-infos/more-info-alarm_control_panel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/more-infos/more-info-alarm_control_panel.js b/src/more-infos/more-info-alarm_control_panel.js index f8d45bf4bf..72089cfca3 100644 --- a/src/more-infos/more-info-alarm_control_panel.js +++ b/src/more-infos/more-info-alarm_control_panel.js @@ -40,7 +40,7 @@ export default new Polymer({ }, stateObjChanged(newVal) { if (newVal) { - this.disarm_button_enabled = newVal.state === 'armed_home' || newVal.state ==='armed_away'; + this.disarm_button_enabled = newVal.state === 'armed_home' || newVal.state === 'armed_away'; this.arm_home_button_enabled = newVal.state === 'disarmed'; this.arm_away_button_enabled = newVal.state === 'disarmed'; }