Merge pull request #88 from GitbookIO/feature/clarity

Feature/clarity

1 files changed, 14 insertions, 13 deletions

diff --git a/theme/javascript/core/quiz.js b/theme/javascript/core/quiz.js
index 7043641..bc1a16d 100644
--- a/theme/javascript/core/quiz.js
+++ b/theme/javascript/core/quiz.js
@@ -5,22 +5,22 @@ define([
     "core/state"
 ], function($, execute, analytic, state){
     // Bind an exercise
-    var prepareExercise = function($exercise) {
+    var prepareQuiz = function($quiz) {
 
-        $exercise.find(".quiz-answers input").click(function(e) {
+        $quiz.find(".quiz-answers input").click(function(e) {
             e.preventDefault();
         });
 
         // Submit: test code
-        $exercise.find(".action-submit").click(function(e) {
+        $quiz.find(".action-submit").click(function(e) {
             e.preventDefault();
-            analytic.track("exercise.submit");
-            $exercise.find("tr.alert-danger,li.alert-danger").removeClass("alert-danger");
-            $exercise.find(".alert-success,.alert-danger").addClass("hidden");
+            analytic.track("exercise.submit", {type: "quiz"});
+            $quiz.find("tr.alert-danger,li.alert-danger").removeClass("alert-danger");
+            $quiz.find(".alert-success,.alert-danger").addClass("hidden");
 
-            $exercise.find(".quiz").each(function(q) {
+            $quiz.find(".question").each(function(q) {
                 var result = true;
-                var $answers = $exercise.find(".quiz-answers").slice(q).find("input[type=radio], input[type=checkbox]");
+                var $answers = $quiz.find(".question-answers").slice(q).find("input[type=radio], input[type=checkbox]");
                 $(this).find("input[type=radio],input[type=checkbox]").each(function(i) {
                     var correct = $(this).is(":checked") === $answers.slice(i).first().is(":checked");
                     result = result && correct;
@@ -33,20 +33,21 @@ define([
 
         });
 
-        $exercise.find(".action-solution").click(function(e) {
-            $exercise.find(".quiz, .quiz-answers").toggleClass("hidden");
+        $quiz.find(".action-solution").click(function(e) {
+            e.preventDefault();
+            $quiz.find(".question-content, .question-answers").toggleClass("hidden");
         });
     };
 
     // Prepare all exercise
     var init = function() {
         state.$book.find("section.quiz").each(function() {
-            prepareExercise($(this));
+            prepareQuiz($(this));
         });
     };
 
     return {
         init: init,
-        prepare: prepareExercise
+        prepare: prepareQuiz
     };
-});
+});
\ No newline at end of file