aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumberto Alfonso Díaz <humberto.alfonso@asvito.es>2019-07-05 14:21:47 +0200
committerHumberto Alfonso Díaz <humberto.alfonso@asvito.es>2019-07-05 14:21:47 +0200
commite1cbac3034100e26ff02ee6c094fde16b90337cf (patch)
tree04538c586f042fb63c8f77cef28ed5dfcac3cb81
parent286ee56101e1538e8cca0b23032332a8f4d686f2 (diff)
OPT Improve chair and fan code
-rw-r--r--src/index.html8
-rw-r--r--src/js/chair.js18
-rw-r--r--src/js/fan_speed.js17
3 files changed, 22 insertions, 21 deletions
diff --git a/src/index.html b/src/index.html
index 45a53d0..17293c9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -12,8 +12,8 @@
</div>
<div class="fanSpeed">
<div class="fanSpeedContainer">
- <input id="FanSpeedInput" type="range" min="1" value="1" max="100" onchange="FANSPEED.update(this.value)">
- <progress id="FanSpeedProgress" value="1" max="100"></progress>
+ <input id="FanSpeed" type="range" min="1" value="1" max="100" onchange="FANSPEED.set(this)">
+ <progress value="1" max="100"></progress>
</div>
<div class="label">
FAN SPEED
@@ -21,7 +21,7 @@
</div>
</div>
<div class="center">
- <a id="LeftChair" value="0" href="#" class="seat left item button" onclick="CHAIR.left()">
+ <a id="LeftChair" value="0" href="#" class="seat left item button" onclick="CHAIR.left(this)">
<img class="off" src="../images/HMI_HVAC_Left_Chair_OFF.svg"/>
<img class="one two" src="../images/HMI_HVAC_Left_Chair_ON.svg"/>
<img class="off" src="../images/HMI_HVAC_ChairIndicator_OFF.svg"/>
@@ -35,7 +35,7 @@
A/C
</div>
</a>
- <a id="RightChair" value="0" href="#" class="seat right item button" onclick="CHAIR.right()">
+ <a id="RightChair" value="0" href="#" class="seat right item button" onclick="CHAIR.right(this)">
<img class="off" src="../images/HMI_HVAC_Right_Chair_OFF.svg"/>
<img class="one two" src="../images/HMI_HVAC_Right_Chair_ON.svg"/>
<img class="off" src="../images/HMI_HVAC_ChairIndicator_OFF.svg"/>
diff --git a/src/js/chair.js b/src/js/chair.js
index ceed88c..b1a3dbb 100644
--- a/src/js/chair.js
+++ b/src/js/chair.js
@@ -1,19 +1,17 @@
var left = 0;
var right = 0;
+function update(node, value){
+ node.setAttribute('value', value);
+}
+
module.exports = {
- update_left: function() {
- document.getElementById('LeftChair').setAttribute('value', left);
- },
- left: function() {
+ left: function(node) {
left = (left + 1) % 3;
- this.update_left();
- },
- update_right: function() {
- document.getElementById('RightChair').setAttribute('value', right);
+ update(node, left);
},
- right: function() {
+ right: function(node) {
right = (right + 1) % 3;
- this.update_right();
+ update(node, right);
},
} \ No newline at end of file
diff --git a/src/js/fan_speed.js b/src/js/fan_speed.js
index cc81fe0..4c8349e 100644
--- a/src/js/fan_speed.js
+++ b/src/js/fan_speed.js
@@ -1,10 +1,13 @@
-module.exports = {
- set: function(value) {
- document.getElementById('FanSpeedProgress').value = value;
- document.getElementById('FanSpeedInput').value = value;
- },
- update: function( value ) {
- this.set(value);
+var value = 0;
+
+function update(node, value) {
+ node.value = value;
+ node.parentNode.getElementsByTagName('progress')[0].value = value;
+}
+module.exports = {
+ set: function(node) {
+ value = node.value;
+ update(node, value);
}
} \ No newline at end of file