wbrawner/interval-timer
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

Added sounds for all periods and replaced old ones with new ones, also fixed functionality issues with timer related to the rest period not triggering automatically

Browse source
This commit is contained in:
William Brawner 2016-09-23 20:02:05 -05:00
parent 385753470a
commit a34224f8b3
9 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
audio/beep-09.mp3
View file

Binary file not shown.

BIN
audio/beep-10.mp3
View file

Binary file not shown.

BIN
audio/button-42(1).mp3
View file

Binary file not shown.

BIN
audio/cool.mp3 Normal file
View file

Binary file not shown.

BIN
audio/high.mp3 Normal file
View file

Binary file not shown.

BIN
audio/low.mp3 Normal file
View file

Binary file not shown.

BIN
audio/rest.mp3 Normal file
View file

Binary file not shown.

BIN
audio/warm.mp3 Normal file
View file

Binary file not shown.

17
js/app.js
View file

@ -99,9 +99,11 @@ if (!window.indexedDB) {
res($scope.config);
});
$scope.initObj.then(function() {
$scope.config.lowIntensity.beep = new Audio('audio/beep-09.mp3');
$scope.config.highIntensity.beep = new Audio('audio/button-42(1).mp3');
$scope.config.coolDown.beep = new Audio('audio/beep-10.mp3');
$scope.config.warmUp.beep = new Audio('audio/warm.mp3');
$scope.config.lowIntensity.beep = new Audio('audio/low.mp3');
$scope.config.highIntensity.beep = new Audio('audio/high.mp3');
$scope.config.rest.beep = new Audio('audio/rest.mp3');
$scope.config.coolDown.beep = new Audio('audio/cool.mp3');
$scope.warmUp.active = true;
})
$scope.round = 1;
@ -126,7 +128,7 @@ if (!window.indexedDB) {
$scope.startTimer();
}
$scope.setWarmUp = function() {
$scope.setPeriod('warmUp', false)
$scope.setPeriod('warmUp');
}
$scope.setCoolDown = function() {
clearInterval($scope.countdown);
@ -169,8 +171,8 @@ if (!window.indexedDB) {
};
$scope.startRest = function() {
if ($scope.time === 0) {
$scope.highIntensity.active = false;
$scope.resetTimer();
$scope.rest.active = false;
$scope.setPeriod('lowIntensity');
}
$scope.$apply(function() {
$scope.time--;
@ -193,8 +195,7 @@ if (!window.indexedDB) {
} else if ($scope.round == $scope.timer.rounds && $scope.cycle < $scope.timer.cycles) {
$scope.cycle++;
$scope.round = 1;
$scope.coolDownBeep.play();
$scope.setPeriod('warmUp');
$scope.setPeriod('rest');
} else {
$scope.setPeriod('lowIntensity');
$scope.round++;