summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSean Whitton <spw@sdf.org>2014-11-12 08:06:59 +0900
committerSean Whitton <spw@sdf.org>2014-11-12 08:06:59 +0900
commit7e75233c954ee10eef9df5366dbf4681680bd59a (patch)
tree5efe19ae67894b0dbf611bfefc0dc7dc17b76643
parent3596bd844296ccb1f18f2d9d53fd77ffc5eccabc (diff)
downloadschoolclock-7e75233c954ee10eef9df5366dbf4681680bd59a.tar.gz
buttons for activity timer; one of them works
-rw-r--r--index.html18
-rw-r--r--js/main.js29
2 files changed, 38 insertions, 9 deletions
diff --git a/index.html b/index.html
index cd01b1a..34e2ac3 100644
--- a/index.html
+++ b/index.html
@@ -63,18 +63,18 @@
<br />
<p class="text-center">
- <button type="button" class="btn btn-primary btn-lg">30s</button>
- <button type="button" class="btn btn-primary btn-lg">1m</button>
- <button type="button" class="btn btn-primary btn-lg">90s</button>
- <button type="button" class="btn btn-primary btn-lg">2m</button>
- <button type="button" class="btn btn-primary btn-lg">3m</button>
- <button type="button" class="btn btn-primary btn-lg">4m</button>
- <button type="button" class="btn btn-primary btn-lg">5m</button>
+ <a id="activityClock30s" class="btn btn-primary btn-lg">3<u>0</u>s</a>
+ <a id="activityClock60s" class="btn btn-primary btn-lg">1m</a>
+ <a id="activityClock90s" class="btn btn-primary btn-lg"><u>9</u>0s</a>
+ <a id="activityClock120s" class="btn btn-primary btn-lg">2m</a>
+ <a id="activityClock180s" class="btn btn-primary btn-lg">3m</a>
+ <a id="activityClock240s" class="btn btn-primary btn-lg">4m</a>
+ <a id="activityClock300s" class="btn btn-primary btn-lg">5m</a>
</p>
<p class="text-center">
- <button type="button" class="btn btn-default btn-lg">Custom</button>
- <button type="button" class="btn btn-default btn-lg">Reset</button>
+ <a id="activityClockCustom" class="btn btn-default btn-lg">Custom</a>
+ <a id="activityClockReset" class="btn btn-default btn-lg">Reset</a>
</p>
<p class="text-center">
diff --git a/js/main.js b/js/main.js
index 7f3bd6c..9dfd5e9 100644
--- a/js/main.js
+++ b/js/main.js
@@ -27,6 +27,14 @@ function timeWastingClockToggle()
$(document).bind('keydown', 'j', timeWastingClockToggle);
+function activityClockGo($seconds)
+{
+ activityClock.setTime($seconds);
+ activityClock.start();
+}
+
+$(document).bind('keydown', '1', function (){activityClockGo(60);});
+
$(document).ready(function(){
$('#timeWastingClockGo').button();
$('#timeWastingClockGo').click(timeWastingClockToggle);
@@ -48,5 +56,26 @@ $(document).ready(function(){
}
}
});
+
+ $('#activityClock30s').button();
+ $('#activityClock30s').click(function (){activityClockGo(30);})
+
+ $('#activityClock60s').button();
+ $('#activityClock60s').click(function (){activityClockGo(60);})
+
+ $('#activityClock90s').button();
+ $('#activityClock90s').click(function (){activityClockGo(90);})
+
+ $('#activityClock120s').button();
+ $('#activityClock120s').click(function (){activityClockGo(120);})
+
+ $('#activityClock180s').button();
+ $('#activityClock180s').click(function (){activityClockGo(180);})
+
+ $('#activityClock240s').button();
+ $('#activityClock240s').click(function (){activityClockGo(240);})
+
+ $('#activityClock300s').button();
+ $('#activityClock300s').click(function (){activityClockGo(300);})
});