From 780b66128fe2e04b0953b2d2f69ed363c0b8bd28 Mon Sep 17 00:00:00 2001
From: Rowan Manning <rowan.manning@nature.com>
Date: Thu, 2 Jul 2015 16:03:12 +0100
Subject: [PATCH] Add the ability to set a per-task timeout

---
 package.json        |  2 +-
 route/new.js        |  9 +++++----
 route/task/edit.js  |  7 ++++---
 view/new.html       | 11 ++++++++++-
 view/task/edit.html | 11 ++++++++++-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 0678959..b27e523 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
 		"express": "~3.4",
 		"express-hbs": "~0.2",
 		"moment": "~2.2",
-		"pa11y-webservice": "~1.4",
+		"pa11y-webservice": "~1.5",
 		"pa11y-webservice-client-node": "~1.1",
 		"underscore": "~1.5"
 	},
diff --git a/route/new.js b/route/new.js
index a7198d4..18bb0eb 100644
--- a/route/new.js
+++ b/route/new.js
@@ -1,15 +1,15 @@
 // This file is part of pa11y-dashboard.
-// 
+//
 // pa11y-dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // pa11y-dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -40,7 +40,8 @@ function route (app) {
 			name: req.body.name,
 			url: req.body.url,
 			standard: req.body.standard,
-			ignore: req.body.ignore || []
+			ignore: req.body.ignore || [],
+			timeout: req.body.timeout
 		};
 		app.webservice.tasks.create(newTask, function (err, task) {
 			if (err) {
diff --git a/route/task/edit.js b/route/task/edit.js
index d2bd3f7..882358a 100644
--- a/route/task/edit.js
+++ b/route/task/edit.js
@@ -1,15 +1,15 @@
 // This file is part of pa11y-dashboard.
-// 
+//
 // pa11y-dashboard is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // pa11y-dashboard is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -60,6 +60,7 @@ function route (app) {
 				if (err) {
 					task.name = req.body.name;
 					task.ignore = req.body.ignore;
+					task.timeout = req.body.timeout;
 					var standards = getStandards().map(function (standard) {
 						if (standard.title === task.standard) {
 							standard.selected = true;
diff --git a/view/new.html b/view/new.html
index 58fc1a1..f20c251 100644
--- a/view/new.html
+++ b/view/new.html
@@ -1,4 +1,4 @@
-{{! 
+{{!
 This file is part of pa11y-dashboard.
 
 pa11y-dashboard is free software: you can redistribute it and/or modify
@@ -65,6 +65,15 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-timeout">Timeout (milliseconds)</label>
+				<input class="form-control" id="new-task-timeout" type="text" placeholder="E.g. 30000" name="timeout" value="{{task.timeout}}"/>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">
diff --git a/view/task/edit.html b/view/task/edit.html
index 8900e53..2f05b30 100644
--- a/view/task/edit.html
+++ b/view/task/edit.html
@@ -1,4 +1,4 @@
-{{! 
+{{!
 This file is part of pa11y-dashboard.
 
 pa11y-dashboard is free software: you can redistribute it and/or modify
@@ -77,6 +77,15 @@ along with pa11y-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 		</div>
 	</div>
 
+	<div class="form-group clearfix">
+		<div class="row">
+			<div class="col-md-4 col-sm-4 col-xs-6">
+				<label class="control-label" for="new-task-timeout">Timeout (milliseconds)</label>
+				<input class="form-control" id="new-task-timeout" type="text" placeholder="E.g. 30000" name="timeout" value="{{task.timeout}}"/>
+			</div>
+		</div>
+	</div>
+
 	<p class="control-label"><b>Ignore these rules</b> <a target="_blank" href="https://github.com/nature/pa11y/wiki/HTML-CodeSniffer-Rules">(full list of rules here)</a></p>
 
 	<div class="standards-lists">