2 files changed, 50 insertions, 38 deletions

@@ -4,41 +4,52 @@ var timerInterval
 
 window.onload = function() {
   <% if @playable %>
-  function pad(val) {
-    var valString = val + ""
-    if (valString.length < 2)
-    {
-      return "0" + valString
-    } else {
-      return valString
+    function pad(val) {
+      var valString = val + ""
+      if (valString.length < 2)
+      {
+        return "0" + valString
+      } else {
+        return valString
+      }
     }
-  }
-  function setTime() {
-    ++totalSeconds
-    $("#seconds").text(pad(totalSeconds%60))
-    $("#minutes").text(pad(parseInt(totalSeconds/60)))
-  }
-  $("#sens").val(window.settings.sensitivity)
-  $("#sens").on("change", function() {
-    window.settings.sensitivity = this.value
-  })
-  $("#volume").val(parseFloat(window.settings.volume))
-  $("#volume").on("change", function() {
-    window.settings.volume = this.value
-  })
-  $("#activation-button button").on("click", function() {
-    var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
-    draw(puzzle)
+    function setTime() {
+      ++totalSeconds
+      $("#seconds").text(pad(totalSeconds%60))
+      $("#minutes").text(pad(parseInt(totalSeconds/60)))
+    }
+    $("#sens").val(window.settings.sensitivity)
+    $("#sens").on("change", function() {
+      window.settings.sensitivity = this.value
+    })
+    $("#volume").val(parseFloat(window.settings.volume))
+    $("#volume").on("change", function() {
+      window.settings.volume = this.value
+    })
 
-    $("#activation-button").hide()
+    <% if @already_started %>
+      var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
+      draw(puzzle)
+    <% else %>
+      $("#activation-button button").on("click", function() {
+        var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
+        draw(puzzle)
 
-    timerInterval = setInterval(setTime, 1000);
-  })
+        $("#activation-button").hide()
+
+        timerInterval = setInterval(setTime, 1000);
+
+        $.ajax({
+          type: "POST",
+          url: "<%= start_puzzle_path(@puzzle, format: :js) %>"
+        })
+      })
+    <% end %>
   <% else %>
-  var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
-  draw(puzzle)
-  drawPath(puzzle, JSON.parse("<%= escape_javascript(sanitize @puzzle.solved_data) %>"))
-  window.trace = function() {}
+    var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
+    draw(puzzle)
+    drawPath(puzzle, JSON.parse("<%= escape_javascript(sanitize @puzzle.solved_data) %>"))
+    window.trace = function() {}
   <% end %>
 }
 
@@ -49,7 +60,7 @@ window.TRACE_COMPLETION_FUNC = function(puzzle, rawPath) {
   $.ajax({
     type: "POST",
     url: "<%= solve_puzzle_path(@puzzle, format: :js) %>",
-    data: { solved: JSON.stringify(rawPath), time: totalSeconds }
+    data: { solved: JSON.stringify(rawPath) <% unless @already_started %> , time: totalSeconds <% end %> }
   })
 }
 
@@ -3,12 +3,13 @@
   %svg#puzzle{ style: "pointer-events: auto"}
 #submission-form
 - if @playable
-  #activation-button
-    %button{ type: "button" } Reveal Puzzle
-  #timer
-    %label#minutes 00
-    %label#colon :
-    %label#seconds 00
+  - unless @already_started
+    #activation-button
+      %button{ type: "button" } Reveal Puzzle
+    #timer
+      %label#minutes 00
+      %label#colon :
+      %label#seconds 00
   %details#trace-settings
     %summary Settings
     .things