From 67bf41627d523d6a5db71723af6423a77c97fd57 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 17:08:46 +0100
Subject: [PATCH 1/3] comment out dead code so CI doesn't complain

---
 www/poll/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 6eb063487..ac238e36d 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -846,7 +846,7 @@ define([
 
         // shortcircuiting before all of this code since it's not quite the
         // behaviour we want, and it's a bit of work to make it Do The Right Thing
-
+/*
         if (First) {
             // assume the first user to the poll wants to be the administrator...
             // TODO prompt them with questions to set up their poll...
@@ -888,7 +888,7 @@ define([
 
             // column might be defined, but that column might have been deleted...
             if (proxy.table.colsOrder.indexOf(column) === -1) { return void promptForName(); }
-        });
+        });*/
     };
 
     var config = {

From b7d9998b9b7a12cb2b93f7f3fe082b364ed30179 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:10:00 +0100
Subject: [PATCH 2/3] fix reference to undefined variable

---
 www/code/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/code/main.js b/www/code/main.js
index ee4fd2f0f..1ee726097 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,6 +253,7 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
+                            if (!two) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;

From 75dd4a5926738b78ae8bc1fd62ca5d9ba8be751f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:11:01 +0100
Subject: [PATCH 3/3] slightly better test for variable

---
 www/code/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/code/main.js b/www/code/main.js
index 1ee726097..4f6b087dd 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,7 +253,7 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
-                            if (!two) { return; }
+                            if (!two && two.replace) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;