trickster 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbd32e7bfd1f9179242368244df932da57a3e0f
-  data.tar.gz: 321ce664454f8351575baeee7fd82e1f193bdbb8
+  metadata.gz: c02a949789bfb2e5ab9c23ffc1d210121b3dc983
+  data.tar.gz: 27b1d7483269c9ab884c2010223f0b9d3dbbc22a
 SHA512:
-  metadata.gz: a5901ea211e0282e9b50a0dbd3ad54097246050b6e0d9b411ed109b070326285c963c5aeaeae5f47622154f66315689d73834c3895c8fd995d1fd01eee8cfc58
-  data.tar.gz: b2de674a15470b8ac4cc5098111683cc0fddaabc1952dc1d07e512425fd5eb58931baa0f033312f22c01f33e3b746a4487541e02dc14fd7ab579594ba1e8ddb4
+  metadata.gz: 0be42836b625f4c93ee09fa61741e26a53180b0a47da1f0062d1427428948f911d0546f88847f31f3bbbde31dd7c17941ea4d3c418dbf6fb208ba94a20433796
+  data.tar.gz: e8892bfa7c41467235842f148415bd88ba5e727033cd966945887104fbca311b37a52af57a09030a356af9b590d0e3383c14c544effa35603fbd2dc5cad1a0d2

data/css/styles.css

@@ -77,7 +77,9 @@ li {
 }
 
 #timer .seconds {
+  /*
   display: none; /* remove this to show seconds elapsing */
+  */
 }
 
 #timer .hours {
@@ -95,6 +97,21 @@ li {
   letter-spacing: -0.2em;
 }
 
+#timer.time-ok {
+  background: green;
+}
+
+#timer.time-warn {
+  background: yellow;
+}
+
+#timer.time-alert {
+  background: red;
+}
+
+#timer.time-over {
+  background: red;
+}
 #timer #controls {
   /* Uncomment this if you want to hide the timer controls
   display: none; 

data/js/timer.js

@@ -19,15 +19,33 @@ var TricksterTimer = function(config,functions) {
 
   function tick() {
     if (!paused) {
-      var now    = (new Date()).getTime();
-      var diff   = (now - start) / 1000;
-      var hour   = Math.floor(diff / (60 * 60));
-      var minute = pad((Math.floor(diff / 60) % 60));
-      var second = pad(Math.floor(diff % 60));
+      var now      = (new Date()).getTime();
+      var diff     = (now - start) / 1000;
+      var diffMins = diff / 60;
+      var hour     = Math.floor(diff / (60 * 60));
+      var minute   = pad((Math.floor(diff / 60) % 60));
+      var second   = pad(Math.floor(diff % 60));
 
       $("#hour").text(hour);
       $("#minute").text(minute);
       $("#second").text(second);
+
+      $("#timer").removeClass("time-ok");
+      $("#timer").removeClass("time-over");
+      $("#timer").removeClass("time-alert");
+      $("#timer").removeClass("time-warn");
+      if (diffMins >= config.lengthMinutes) {
+        $("#timer").addClass("time-over");
+      }
+      else if (diffMins >= config.lengthAlertAt) {
+        $("#timer").addClass("time-alert");
+      }
+      else if (diffMins >= config.lengthWarnAt) {
+        $("#timer").addClass("time-warn");
+      }
+      else {
+        $("#timer").addClass("time-ok");
+      }
     }
 
     if (running) {
@@ -63,6 +81,7 @@ var TricksterTimer = function(config,functions) {
     $("#play").hide();
     $("#pause").show();
     if (!running) {
+      start = (new Date()).getTime();
       running = true;
       tick();
     }

data/js/trickster.js

@@ -26,7 +26,10 @@ var TricksterDefaultConfig = {
   /** These keycodes, if encountered, will not be sent along
       to the browser.  Useful if there might be some vertical
       scrolling and 32/33/34 would otherwise scroll */
-  keyCodesPreventingDefault: [ 34, 32, 33 ]
+  keyCodesPreventingDefault: [ 34, 32, 33 ],
+  lengthMinutes: 3,
+  lengthWarnAt: 1,
+  lengthAlertAt: 2
 };
 /** Loads Trickster.
  * config: configuration, or TricksterDefaultConfig to get the defaults
@@ -157,9 +160,6 @@ var TricksterLoader = function(config,functions) {
         else if (direction == config.backSwipe) {
           Trickster.back();
         }
-        else {
-          alert("Swiped " + direction);
-        }
       },
     });
   }

data/lib/trickster/version.rb

@@ -1,3 +1,3 @@
 module Trickster
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trickster
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - David Copeland