Permalink
Browse files

fixed conflicts

  • Loading branch information...
coreyarch1234 committed Jul 1, 2017
2 parents bb7ff98 + dd55c1a commit 6a94af43729952fd8cb5a9470ded4e37bb9349f4
Showing with 5 additions and 6 deletions.
  1. +4 −2 public/scripts/sockets.js
  2. +1 −4 views/games/show.handlebars
@@ -124,22 +124,24 @@ $(function() {
});
socket.on('subscribe:next_question?', function() {
$('#correct-answer-alert').show();
$('.answer-alert-display').show();
setTimeout(function() {
var nextQuestionsSize = $('.current-question').next().length;
if (nextQuestionsSize == 0) {
alert("This is the end of the game!");
window.location.href = '/';
// end game
} else {
$('#correct-answer-alert').text('').hide();
$('#correct-answer-alert').text('');
$('.current-question').hide()
$('.current-question').next().show().addClass('current-question');
$('.current-question').first().removeClass('current-question');
$('#answer-input').show(); // unhide input
$('#answers').hide();
}
}, 5000);
})
@@ -27,10 +27,7 @@
<!-- Score display -->
<h1>Score: </h1>
<!-- <div class="answer-alert" id="score-display" style="display: none;">
</div> -->
<!-- Display if they got question right or wrong -->
<div class="answer-alert-container">
<div class="answer-alert answer-alert-display" id="correct-answer-alert"></div>

0 comments on commit 6a94af4

Please sign in to comment.