aboutsummaryrefslogtreecommitdiffhomepage
path: root/assets
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2015-03-18 09:19:06 +0000
committerSean Whitton <spwhitton@spwhitton.name>2015-03-18 09:19:22 +0000
commit6565e14d2459b81961e5a605b2691ea54cbe7256 (patch)
tree01effcc9d1c31e08eb57a3b91cbef4f5dd03c070 /assets
parente5f6fb9d984d8de4984ba360531caf739d36c00f (diff)
downloadsariulclocks-6565e14d2459b81961e5a605b2691ea54cbe7256.tar.gz
disable confirmation on time-wasting resetting clock
because it gets called when we submit the end of class form
Diffstat (limited to 'assets')
-rw-r--r--assets/js/main.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/js/main.js b/assets/js/main.js
index b3ad26e..b79de74 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -236,8 +236,8 @@ timeWastingClock.running = false;
timeWastingClock.reset = $.proxy(function () {
if (this.getTime() != 1)
{
- if (confirm('Are you sure?'))
- {
+ // if (confirm('Are you sure?'))
+ // {
if (this.running)
{
$('#timeWastingClockGo').html('Start <u>t</u>imer');
@@ -246,7 +246,7 @@ timeWastingClock.reset = $.proxy(function () {
}
$.jStorage.set('time_wasted', 0);
this.setTime(0);
- }
+ // }
}
}, timeWastingClock);
timeWastingClock.toggle = $.proxy(function () {