aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <david@sighup.nz>2017-05-18 12:06:54 +1200
committerDavid Phillips <david@sighup.nz>2017-05-18 12:06:54 +1200
commit8074f7d7333bb538429cff7511a9954ac2e1efc6 (patch)
tree37d888007547b42a1b10c2f80d8e387713350379
parent5a5eb6575f02081100b4bb32c8c5263da1382bf3 (diff)
parentb751fad71fbc7d65686dbccb554be9a5d313e3d7 (diff)
downloadpetrichor-develop.tar.xz
Merge branch 'develop'HEADmasterdevelop
-rw-r--r--.gitignore1
-rw-r--r--petrichor.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3367afd..13cb0f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
old
+index.theme
diff --git a/petrichor.js b/petrichor.js
index 04b12dd..b4dc768 100644
--- a/petrichor.js
+++ b/petrichor.js
@@ -113,7 +113,7 @@ function countdown()
label.innerHTML = ' in ' + time_remaining + ' seconds';
time_remaining--;
if (time_remaining >= 0)
- setTimeout('countdown()', 1000);
+ setTimeout(countdown, 1000);
}
function build_session_list()
@@ -140,7 +140,7 @@ function update_time()
niceMinutes = "0"+niceMinutes;
document.getElementById('date').innerHTML = days[d.getDay()] + ", " + d.getDate() + " " + months[d.getMonth()];
document.getElementById('time').innerHTML = niceHours + ":" + niceMinutes;
- setTimeout('update_time()', 1000);
+ setTimeout(update_time, 1000);
}
function start()