From 793e3ec6c3aa30fbd8aafbd62d554d1d24c4b434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Sandstr=C3=B6m?= <per.j.sandstrom@gmail.com>
Date: Fri, 25 Sep 2015 21:54:58 +0200
Subject: [PATCH] fixed some code review comments

---
 .../more-info-alarm_control_panel.html        |  8 +--
 .../more-info-alarm_control_panel.js          | 56 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html
index ba8c5c0519..c783f6c749 100644
--- a/src/more-infos/more-info-alarm_control_panel.html
+++ b/src/more-infos/more-info-alarm_control_panel.html
@@ -6,12 +6,12 @@
 <dom-module id='more-info-alarm_control_panel'>
   <template>
       <div class='layout horizontal'>
-	      <paper-input label='code' input='[[entered_code]]' pattern='[[code_format]]' on-keyup='entered_code_changed' type='password' hidden$='[[!code_input_visible]]' disabled$='[[!code_input_enabled]]'></paper-input>
+        <paper-input label='code' value$='{{enteredCode}}' pattern$='[[codeFormat]]' type='password' hidden$='[[!codeInputVisible]]' disabled$='[[!codeInputEnabled]]'></paper-input>
       </div>
       <div class='layout horizontal'>
-        <paper-button on-tap='handleDisarmTap' hidden$='[[!disarm_button_enabled]]' disabled$='[[!code_valid]]'>Disarm</paper-button>
-        <paper-button on-tap='handleHomeTap' hidden$='[[!arm_home_button_enabled]]' disabled$='[[!code_valid]]'>Arm Home</paper-button>
-        <paper-button on-tap='handleAwayTap' hidden$='[[!arm_away_button_enabled]]' disabled$='[[!code_valid]]'>Arm Away</paper-button>
+	      <paper-button on-tap='handleDisarmTap' hidden$='[[!disarmButtonVisible]]' disabled$='[[!codeValid]]'>Disarm</paper-button>
+	      <paper-button on-tap='handleHomeTap' hidden$='[[!armHomeButtonVisible]]' disabled$=[[!codeValid]]>Arm Home</paper-button>
+	      <paper-button on-tap='handleAwayTap' hidden$='[[!armAwayButtonVisible]]' disabled$='[[!codeValid]]'>Arm Away</paper-button>
       </div>
   </template>
 </dom-module>
diff --git a/src/more-infos/more-info-alarm_control_panel.js b/src/more-infos/more-info-alarm_control_panel.js
index 443eafa2e6..5f455e46ed 100644
--- a/src/more-infos/more-info-alarm_control_panel.js
+++ b/src/more-infos/more-info-alarm_control_panel.js
@@ -5,72 +5,72 @@ import Polymer from '../polymer';
 export default new Polymer({
   is: 'more-info-alarm_control_panel',
   handleDisarmTap() {
-    this.callService('alarm_disarm', {code: this.entered_code});
+    this.callService('alarm_disarm', {code: this.enteredCode});
   },
   handleHomeTap() {
-    this.callService('alarm_arm_home', {code: this.entered_code});
+    this.callService('alarm_arm_home', {code: this.enteredCode});
   },
   handleAwayTap() {
-    this.callService('alarm_arm_away', {code: this.entered_code});
+    this.callService('alarm_arm_away', {code: this.enteredCode});
   },
   properties: {
     stateObj: {
       type: Object,
       observer: 'stateObjChanged',
     },
-    entered_code: {
+    enteredCode: {
       type: String,
       value: '',
     },
-    disarm_button_enabled: {
+    disarmButtonVisible: {
       type: Boolean,
       value: false,
     },
-    arm_home_button_enabled: {
+    armHomeButtonVisible: {
       type: Boolean,
       value: false,
     },
-    arm_away_button_enabled: {
+    armAwayButtonVisible: {
       type: Boolean,
       value: false,
     },
-    code_input_visible: {
+    codeInputVisible: {
       type: Boolean,
       value: false,
     },
-    code_input_enabled: {
+    codeInputEnabled: {
       type: Boolean,
       value: false,
     },
-    code_format: {
+    codeFormat: {
       type: String,
       value: '',
     },
-    code_valid: {
+    codeValid: {
       type: Boolean,
-      value: false,
+      computed: 'validateCode(enteredCode, codeFormat)',
     },
   },
-  validate_code(code) {
-    const re = new RegExp(this.code_format);
-    if (this.code_format === null) {
-      this.code_valid = true;
-      return;
+  validateCode: function(code, format) {
+    const re = new RegExp(format);
+    if (format === null) {
+      return true;
     }
-    this.code_valid = re.test(code);
-  },
-  entered_code_changed(ev) {
-    this.validate_code(ev.target.value);
+    return re.test(code);
   },
   stateObjChanged(newVal) {
     if (newVal) {
-      this.code_format = newVal.attributes.code_format;
-      this.validate_code(this.entered_code);
-      this.code_input_visible = newVal.attributes.code_format !== null;
-      this.code_input_enabled = (newVal.state === 'armed_home' || newVal.state === 'armed_away' || newVal.state === 'disarmed');
-      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.codeFormat = newVal.attributes.code_format;
+      this.codeInputVisible = this.codeFormat !== null;
+      this.codeInputEnabled = (
+        newVal.state === 'armed_home' ||
+	newVal.state === 'armed_away' ||
+	newVal.state === 'disarmed');
+      this.disarmButtonVisible = (
+	newVal.state === 'armed_home' ||
+	newVal.state === 'armed_away');
+      this.armHomeButtonVisible = newVal.state === 'disarmed';
+      this.armAwayButtonVisible = newVal.state === 'disarmed';
     }
     this.async(() => this.fire('iron-resize'), 500);
   },