fix cammie controls and integrity of html

2016-07-19 11:31:12 +02:00 · 2016-07-19 11:31:12 +02:00 · 53ae62440f
commit 53ae62440f
parent 911978d4ba
4 changed files with 69 additions and 16 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,9 +14,10 @@ install:
 script:
 - bundle exec nanoc
 - bundle exec nanoc check elinks
+- bundle exec nanoc check html
 - bundle exec nanoc check ilinks
- bundle exec nanoc check stale
 - bundle exec nanoc check mixed_content
+- bundle exec nanoc check stale
 after_success:
 - mv deploy_key ~/.ssh/id_rsa
 - chmod 600 ~/.ssh/id_rsa
--- a/content/assets/scripts/cammie.coffee
+++ b/content/assets/scripts/cammie.coffee
@ -1,15 +1,68 @@
-$('.ctrl').click ->
-  $.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi",
-    data:
-      command: $(this).attr("command")
-      posX: $(this).attr("posX")
-      posY: $(this).attr("posY")
+# All the cammie controls
+commands =
+  up:
+    command: 'set_relative_pos'
+    posX:    0
+    posY:    10
+  down:
+    command: 'set_relative_pos'
+    posX:    0
+    posY:    -10
+  left:
+    command: 'set_relative_pos'
+    posX:    -10
+    posY:    0
+  right:
+    command: 'set_relative_pos'
+    posX:    10
+    posY:    0

+# Initially hide all the controls
 $('.ctrl').hide()

-timeout = null
+$('.ctrl').click ->
+  $.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi",
+    data: commands[$(this).attr('id')]

-$('.fullpage').mousemove (event) ->
-  clearTimeout(timeout) if timeout
+timer = undefined
+fade_buffer = false
+blocking = false
+
+clear_timer = () ->
+  clearTimeout timer
+  timer = 0
+
+set_timer = () ->
+  timer = setTimeout((->
+    ctrl_hide()
+    fade_buffer = true
+  ), 3000)
+
+ctrl_show = () ->
  $('.ctrl').fadeIn()
-  timeout = setTimeout (-> $('.ctrl').fadeOut()), 3000
+
+ctrl_hide = () ->
+  $('.ctrl').fadeOut()
+
+block_hide = () ->
+  clear_timer()
+  blocking = true
+
+unblock_hide = () ->
+  set_timer()
+  blocking = false
+
+$(document).mousemove ->
+  if !blocking
+    if !fade_buffer
+      clear_timer() if timer
+    else
+      fade_buffer = false
+
+    ctrl_show()
+    set_timer()
+
+$('.ctrl').mouseover(block_hide)
+
+# Timeout when we leave the window
+$(document).mouseleave(unblock_hide)
--- a/content/cammie.erb
+++ b/content/cammie.erb
@ -4,16 +4,16 @@
    src="https://kelder.zeus.ugent.be/webcam/video/mjpg.cgi?profileid=2"
    alt=""
   />
-  <div id="left" class="ctrl" command="set_relative_pos" posX="-10" posY="0">
+  <div id="left" class="ctrl">
    <i class="fa fa-chevron-left fa-2x"></i>
  </div>
-  <div id="right" class="ctrl" command="set_relative_pos" posX="10" posY="0">
+  <div id="right" class="ctrl">
    <i class="fa fa-chevron-right fa-2x"></i>
  </div>
-  <div id="up" class="ctrl" command="set_relative_pos" posX="0" posY="10">
+  <div id="up" class="ctrl">
    <i class="fa fa-chevron-up fa-2x"></i>
  </div>
-  <div id="down" class="ctrl" command="set_relative_pos" posX="0" posY="-10">
+  <div id="down" class="ctrl">
    <i class="fa fa-chevron-down fa-2x"></i>
  </div>
 </div>
--- a/layouts/default.erb
+++ b/layouts/default.erb
@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <html lang="en">
  <head>
-    <meta charset="utf-8">
    <meta http-equiv="x-ua-compatible" content="ie=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">