From 2116f89716b72e662eaa8f7e68d911b650363491 Mon Sep 17 00:00:00 2001 From: kakts Date: Sun, 11 Dec 2016 02:17:21 +0900 Subject: [PATCH 1/3] Refactored lib/dasher.js --- lib/dasher.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/dasher.js b/lib/dasher.js index e3958ff..477d44e 100644 --- a/lib/dasher.js +++ b/lib/dasher.js @@ -7,23 +7,23 @@ function doLog(message) { } function DasherButton(button) { - var options = {headers: button.headers, body: button.body, json: button.json, formData: button.formData} + var options = {headers: button.headers, body: button.body, json: button.json, formData: button.formData}; - this.dashButton = dashButton(button.address, button.interface, button.timeout) + this.dashButton = dashButton(button.address, button.interface, button.timeout); this.dashButton.on("detected", function() { - doLog(button.name + " pressed.") - doRequest(button.url, button.method, options) - }) + doLog(button.name + " pressed."); + doRequest(button.url, button.method, options); + }); - doLog(button.name + " added.") + doLog(button.name + " added."); } function doRequest(requestUrl, method, options, callback) { - options = options || {} - options.query = options.query || {} - options.json = options.json || false - options.headers = options.headers || {} + options = options || {}; + options.query = options.query || {}; + options.json = options.json || false; + options.headers = options.headers || {}; var reqOpts = { url: url.parse(requestUrl), @@ -33,11 +33,11 @@ function doRequest(requestUrl, method, options, callback) { json: options.json, headers: options.headers, formData: options.formData - } + }; request(reqOpts, function onResponse(error, response, body) { if (error) { - doLog("there was an error"); + doLog("There was an error"); console.log(error); } if (response && response.statusCode === 401) { @@ -50,9 +50,9 @@ function doRequest(requestUrl, method, options, callback) { } if (callback) { - callback(error, response, body) + callback(error, response, body); } - }) + }); } -module.exports = DasherButton +module.exports = DasherButton; From a9d16cf61bc685c40d1bb5eadd98888e81dc240e Mon Sep 17 00:00:00 2001 From: kakts Date: Sun, 11 Dec 2016 02:24:45 +0900 Subject: [PATCH 2/3] Added semicolons --- lib/dasher.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dasher.js b/lib/dasher.js index 477d44e..6689759 100644 --- a/lib/dasher.js +++ b/lib/dasher.js @@ -1,6 +1,6 @@ -var url = require('url') +var url = require('url'); var dashButton = require('node-dash-button'); -var request = require('request') +var request = require('request'); function doLog(message) { console.log('[' + (new Date().toISOString()) + '] ' + message); From aef070e8868d66cea6b017a7fb8fa8ae149e4a9d Mon Sep 17 00:00:00 2001 From: kakts Date: Sun, 11 Dec 2016 02:29:15 +0900 Subject: [PATCH 3/3] Added semicolons --- app.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 7652b79..73542d2 100755 --- a/app.js +++ b/app.js @@ -1,9 +1,9 @@ -var DasherButton = require('./lib/dasher') -var config = require('./config/config.json') +var DasherButton = require('./lib/dasher'); +var config = require('./config/config.json'); -var buttons = [] +var buttons = []; for (var i = 0; i < config.buttons.length; i++) { - button = config.buttons[i] - buttons.push(new DasherButton(button)) + button = config.buttons[i]; + buttons.push(new DasherButton(button)); }