From cdfc435433677c3f5f237e7d0c129fd75c29c820 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 30 Nov 2014 16:52:54 +0900 Subject: move activityClockGo into a kind of prototype --- js/main.js | 54 +++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/js/main.js b/js/main.js index 78e6001..f8b4049 100644 --- a/js/main.js +++ b/js/main.js @@ -157,7 +157,17 @@ $.ionSound({ preload: true }); -var timeWastingClock = new FlipClock($('.time-wasting-clock'), { +function MyFlipClock (jq, obj) +{ + var theClock = new FlipClock(jq, obj); + theClock.go = function (seconds) { + this.setTime(seconds); + this.start(); + }; + return theClock; +} + +var timeWastingClock = MyFlipClock($('.time-wasting-clock'), { autoStart:false, callbacks:{ interval:function () { @@ -172,7 +182,7 @@ timeWastingClock.setTime($.jStorage.get("time_wasted", 0)); var $timeWastingClockRunning = false; -var activityClock = new FlipClock($('.activity-countdown'), { +var activityClock = MyFlipClock($('.activity-countdown'), { autoStart:false, countdown:true, callbacks:{ @@ -212,12 +222,6 @@ function getRandomInt(min, max) { return Math.floor(Math.random() * (max - min)) + min; } -function activityClockGo($seconds) -{ - activityClock.setTime($seconds); - activityClock.start(); -} - function timeWastingClockReset() { if (timeWastingClock.getTime() != 0) @@ -300,16 +304,16 @@ $(document).bind('keydown', 's', timeWastingClockReset); $(document).bind('keydown', 'r', activityClockReset); $(document).bind('keydown', 'c', activityClockCustom); -$(document).bind('keydown', '0', function (){activityClockGo(30);}); -$(document).bind('keydown', '1', function (){activityClockGo(60);}); -$(document).bind('keydown', '9', function (){activityClockGo(90);}); -$(document).bind('keydown', '2', function (){activityClockGo(120);}); -$(document).bind('keydown', '3', function (){activityClockGo(180);}); -$(document).bind('keydown', '4', function (){activityClockGo(240);}); -$(document).bind('keydown', '5', function (){activityClockGo(300);}); -$(document).bind('keydown', '6', function (){activityClockGo(360);}); -$(document).bind('keydown', '7', function (){activityClockGo(420);}); -$(document).bind('keydown', '8', function (){activityClockGo(480);}); +$(document).bind('keydown', '0', function (){activityClock.go(30);}); +$(document).bind('keydown', '1', function (){activityClock.go(60);}); +$(document).bind('keydown', '9', function (){activityClock.go(90);}); +$(document).bind('keydown', '2', function (){activityClock.go(120);}); +$(document).bind('keydown', '3', function (){activityClock.go(180);}); +$(document).bind('keydown', '4', function (){activityClock.go(240);}); +$(document).bind('keydown', '5', function (){activityClock.go(300);}); +$(document).bind('keydown', '6', function (){activityClock.go(360);}); +$(document).bind('keydown', '7', function (){activityClock.go(420);}); +$(document).bind('keydown', '8', function (){activityClock.go(480);}); $(document).ready(function(){ $('#klaxon').button(); @@ -334,25 +338,25 @@ $(document).ready(function(){ $('#activityClockCustom').click(activityClockCustom); $('#activityClock30s').button(); - $('#activityClock30s').click(function (){activityClockGo(30);}) + $('#activityClock30s').click(function (){activityClock.go(30);}) $('#activityClock60s').button(); - $('#activityClock60s').click(function (){activityClockGo(60);}) + $('#activityClock60s').click(function (){activityClock.go(60);}) $('#activityClock90s').button(); - $('#activityClock90s').click(function (){activityClockGo(90);}) + $('#activityClock90s').click(function (){activityClock.go(90);}) $('#activityClock120s').button(); - $('#activityClock120s').click(function (){activityClockGo(120);}) + $('#activityClock120s').click(function (){activityClock.go(120);}) $('#activityClock180s').button(); - $('#activityClock180s').click(function (){activityClockGo(180);}) + $('#activityClock180s').click(function (){activityClock.go(180);}) $('#activityClock240s').button(); - $('#activityClock240s').click(function (){activityClockGo(240);}) + $('#activityClock240s').click(function (){activityClock.go(240);}) $('#activityClock300s').button(); - $('#activityClock300s').click(function (){activityClockGo(300);}) + $('#activityClock300s').click(function (){activityClock.go(300);}) $('#date-toggle').button(); $('#date-toggle').click(function (){toggleDateStyle();}); -- cgit v1.2.3