diff --git a/RedbullShopper101/TruthOrMyth/truthormyth.js b/RedbullShopper101/TruthOrMyth/truthormyth.js index bb5f45a..f481d1c 100644 --- a/RedbullShopper101/TruthOrMyth/truthormyth.js +++ b/RedbullShopper101/TruthOrMyth/truthormyth.js @@ -1,7 +1,9 @@ $(function () { window.activeScreen = 0; window.answers = {}; - window.correctAnswers = {1: 'all', 4: 1, 7: 3, 10: 3}; + window.correctAnswers = {1: 'all', 4: 0, 7: 0, 10: 1}; + window.audioPlayer = null; + for (var i = 1; i <= 12; i++) { $('#screen_' + i).html('

'); } @@ -14,27 +16,34 @@ $(function () { return false; }); $("#next,#prev").on('click', function () { - if($(this).next()){ - $.each(function(){ - - }); + let i; + if ($(this).is('#next')) { + for (i = window.activeScreen + 1; i <= 12; i++) { + if (window.correctAnswers[i] !== undefined && window.correctAnswers[i] !== null) { + setActiveScreen(i); + break; + } + } + } + if ($(this).is('#prev')) { + for (i = window.activeScreen - 3; i >= 1; i--) { + if (window.correctAnswers[i] !== undefined && window.correctAnswers[i] !== null) { + setActiveScreen(i); + break; + } + } } - setActiveScreen(window.activeScreen + 1); - return false; - }); - $("#retry").on('click', function () { - window.answers = {}; - setActiveScreen(1); return false; }); + $('#read').on('click', function () { - setActiveScreen(window.activeScreen+1); + setActiveScreen(window.activeScreen + 1); return false; }); $('#listen').on('click', function () { - setActiveScreen(window.activeScreen+1); + playAudio(window.activeScreen); return false; }); @@ -43,10 +52,17 @@ $(function () { $("#closemore").hide(); return false; }); - setActiveScreen(5); + setActiveScreen(1); }); +function playAudio(screen) { + stopAudio(); + window.audioPlayer = new Audio(screen + '.mp3'); + window.audioPlayer.play(); +} + function setActiveScreen(i) { + stopAudio(); window.activeScreen = i; $('body').attr('data-screen', i); $('[data-screens]').each(function () { @@ -64,6 +80,14 @@ function setActiveScreen(i) { updateScore(); } +function stopAudio() { + try { + window.audioPlayer.pause(); + } catch (e) { + + } +} + function updateScore() { var s = 0; $.each(window.answers, function (k, v) { diff --git a/RedbullShopper101/_doc/Shopper_constraints.mp3 b/RedbullShopper101/_doc/Shopper_constraints.mp3 deleted file mode 100644 index 0a56477..0000000 Binary files a/RedbullShopper101/_doc/Shopper_constraints.mp3 and /dev/null differ diff --git a/RedbullShopper101/_doc/Shoppers_are_rational.mp3 b/RedbullShopper101/_doc/Shoppers_are_rational.mp3 deleted file mode 100644 index 2f2c3f0..0000000 Binary files a/RedbullShopper101/_doc/Shoppers_are_rational.mp3 and /dev/null differ diff --git a/RedbullShopper101/_doc/Shoppers_need_help.mp3 b/RedbullShopper101/_doc/Shoppers_need_help.mp3 deleted file mode 100644 index abdc443..0000000 Binary files a/RedbullShopper101/_doc/Shoppers_need_help.mp3 and /dev/null differ diff --git a/RedbullShopper101/_doc/part_1fdac1991e681802ca7b1062be7ec39e.mp3 b/RedbullShopper101/_doc/part_1fdac1991e681802ca7b1062be7ec39e.mp3 deleted file mode 100644 index fa1147e..0000000 Binary files a/RedbullShopper101/_doc/part_1fdac1991e681802ca7b1062be7ec39e.mp3 and /dev/null differ