From 89ee56917dfc8ed45d5a9450b827bf4a5aa15dcf Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 30 Mar 2015 23:59:28 +0000 Subject: fix bug where time wasting clock not fully reset Time wasting clock reset method doesn't change value of time wasted in end of lesson form. If the time wasting clock is reset and then no time is wasted before the end of the class, the time before the clock is reset is recorded. --- assets/js/main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/js/main.js b/assets/js/main.js index ab260cd..f0c1941 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -304,8 +304,9 @@ timeWastingClock.reset = $.proxy(function () { this.stop(); this.running = false; } - $.jStorage.set('time_wasted', 0); - this.setTime(0); + $.jStorage.set('time_wasted', 0); + $("#class_time_wasted").val(0); + this.setTime(0); // } } }, timeWastingClock); -- cgit v1.2.3