From 452f6ce03d452e7e3a6a9946da0bafda032d4973 Mon Sep 17 00:00:00 2001 From: LennyLinux Date: Sun, 10 Nov 2013 18:35:58 +0100 Subject: [PATCH 1/2] extend the number-checker component with an input listener --- components/number-checker.html | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/components/number-checker.html b/components/number-checker.html index bc3e625..5c1f4bb 100644 --- a/components/number-checker.html +++ b/components/number-checker.html @@ -49,14 +49,11 @@ this.querySelector("input").value = this.checkAgainst; var checkOptions = this.querySelector("select"); - checkOptions.value = this.checkFor; checkOptions.onchange = function(e){ - if (!e) - var e = window.event; that.checkFor = this.options[this.selectedIndex].value; - that.setAttribute("checkFor",that.checkFor); + that.setAttribute("checkFor", that.checkFor); that.fakeSave(); } }, @@ -64,8 +61,8 @@ this.setAttribute("countItem",this.getAttribute("countItem")); }, checkTheNumber: function () { - that = this; var ok = false; + var that = this; switch (this.checkFor) { case 'greater': @@ -87,10 +84,8 @@ if(this.incomingNumber != this.checkAgainst){ ok = true; } break; } - if(this.incomingNumber == false){ - ok = false; - } - if(ok == true){ + + if(ok === true) { this.indicator.setAttribute("light","good"); this.broadcast('yes', this.incomingNumber); } else { @@ -120,9 +115,21 @@ broadcasts: ['yes', 'no'], defaultBroadcasts: ['yes'], listeners: { - checkNumber: function (listener,channel) { - this.incomingNumber = parseInt(listener) || false; - this.checkTheNumber(); + checkNumber: function (listener, channel) { + var nr = parseInt(listener, 10); + if ($.isNumeric(nr)) { + this.incomingNumber = nr; + this.checkTheNumber(); + } + }, + inputNumber: function (listener, channel) { + var nr = parseInt(listener, 10); + if ($.isNumeric(nr)) { + this.querySelector("input").value = nr; + this.checkAgainst = nr; + this.setAttribute("checkAgainst", this.checkAgainst); + this.fakeSave(); + } } } }); From 2c091d4ec3507a52dacb5ddc58f2c58f5b8c3d75 Mon Sep 17 00:00:00 2001 From: LennyLinux Date: Sat, 16 Nov 2013 22:29:12 +0100 Subject: [PATCH 2/2] cleanup code --- components/number-checker.html | 77 +++++++++++++++------------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/components/number-checker.html b/components/number-checker.html index 5c1f4bb..9767dc8 100644 --- a/components/number-checker.html +++ b/components/number-checker.html @@ -29,87 +29,77 @@