Added triggerAnswer() function

Author: jlyst

src/trivia.js

@@ -41,17 +41,17 @@ var trivia = {
     });
     return cats;
   },
-  gotoNextQuestion: function(){ //this just forwards a "deprecated function"
+  gotoNextQuestion: function () { //this just forwards a "deprecated function"
     displayQuestion();
   },
   insertCategoriesInfo: function () {
     var cats = this.getCategories();
     var unfcats = this.getUnfinishedCategories();
     $('#category-set').html('');
-    cats.forEach((c)=> {
+    cats.forEach((c) => {
       var $catbtn = $(`<button class="category-btn">${c}</button>`);
       if (unfcats.includes(c)) {
-        $catbtn.on('click', function(e) {
+        $catbtn.on('click', function (e) {
           trivia.currentCategory = c;
           onClickedCategory();
         });
@@ -64,7 +64,7 @@ var trivia = {
     trivia.state = "question";
     $(".answer-btn").attr("disabled", null);
     trivia.questionIndex = trivia.questions.findIndex((q) => {
-      if(!this.categoriesEnabled) return !q.response;
+      if (!this.categoriesEnabled) return !q.response;
       else return !q.response && q.category == this.currentCategory;
     });
     if (trivia.questions[trivia.questionIndex]) {
@@ -74,11 +74,11 @@ var trivia = {
       }
     }
     else {
-      if(this.totalAnswered == this.totalQuestions) {
+      if (this.totalAnswered == this.totalQuestions) {
         trivia.state = "thankyou";
         displayThankyou(); //game over
       }
-      else if(this.categoriesEnabled) {
+      else if (this.categoriesEnabled) {
         trivia.state = "categories";
         displayCategories();
       }
@@ -92,30 +92,33 @@ var trivia = {
     //listen for answer button clicks
     $(".screen").on("click", ".answer-btn", ev => {
       $(".answer-btn").attr("disabled", "disabled"); //turn off buttons to prohibit cheating :)
-      if ($(ev.target).is("#correctAnswer")) {
-        trivia.currentQuestion.response = "correct";
-        trivia.state = "correct";
-      } else {
-        trivia.currentQuestion.response = "incorrect";
-        trivia.state = "incorrect";
-      }
-      trivia.totalCorrect = trivia.questions.filter(item => {
-        return item.response == "correct";
-      }).length;
-      trivia.totalAnswered = trivia.questions.filter(item => {
-        return item.response;
-      }).length;
-      onClickedAnswer(trivia.currentQuestion.response == "correct");
+      trivia.triggerAnswer($(ev.target).is("#correctAnswer"));
     });
 
     //listen for restart button click
     $(".screen").on("click", ".start-btn", ev => {
-        this.questions.forEach(function(q){ delete q.response });
-        trivia.questionIndex = 0;
-        if (!this.categoriesEnabled) trivia.state = "question";
-        else trivia.state = "categories";
-        trivia.currentQuestion = trivia.questions[0]; //reset to the first question
+      this.questions.forEach(function (q) { delete q.response });
+      trivia.questionIndex = 0;
+      if (!this.categoriesEnabled) trivia.state = "question";
+      else trivia.state = "categories";
+      trivia.currentQuestion = trivia.questions[0]; //reset to the first question
       onClickedStart();
     });
+  },
+  triggerAnswer: function (correct) {
+    if (correct) {
+      trivia.currentQuestion.response = "correct";
+      trivia.state = "correct";
+    } else {
+      trivia.currentQuestion.response = "incorrect";
+      trivia.state = "incorrect";
+    }
+    trivia.totalCorrect = trivia.questions.filter(item => {
+      return item.response == "correct";
+    }).length;
+    trivia.totalAnswered = trivia.questions.filter(item => {
+      return item.response;
+    }).length;
+    onClickedAnswer(trivia.currentQuestion.response == "correct");
   }
 };