From 4bcfeb755cada6d3a77a55fd18596ed4875acc50 Mon Sep 17 00:00:00 2001
From: Iam Naughton Phier <truck@notonfire.co.uk>
Date: Thu, 26 Mar 2015 15:43:20 +0200
Subject: [PATCH] Fix: my tablet did not send doubleclick events, changed to
 'edges'

---
 index.html   | 19 +++++++++++++++----
 sahli.coffee | 22 ++++++++++++++++------
 sahli.css    |  1 +
 sahli.js     | 29 +++++++++++++++++++++--------
 4 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/index.html b/index.html
index b9862bf..0c9660b 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,16 @@
   </head>
   <body>
   <div id="outbox">
-    <div id='sahliviewer'><hr></div>
+    <div id='sahliviewer'><hr>
+      <h1>Space to Start</h1>
+      <ul class='keylist'>
+        <h5>MOBILE/MOUSE</h5>
+        <li class='nodot'><span class="key">TOP</span> start scrolling / reverse scrolling</li>
+        <li class='nodot'><span class="key">BOTTOM</span> Next Picture </li>
+        <li class='nodot'><span class="key">LEFT</span> Fullscreen</li>
+        <li class='nodot'><span class="key">RIGHT</span> Panel Mode</li>
+      </ul>
+    </div>
   </div>
 
   <div align="center">
@@ -43,9 +52,11 @@
         <li><span class="key">I</span> SAUCE or Partymeister info</li>
         <li><span class="key">V</span> Center Small Ascii Vertically</li>
         <li><span class="key">H</span> This help (:  <span class="key">Esc</span> Cancel fullscreen</li>
-        <li class='nodot'><b>Tab also works for "info" but browsers hate it, so use 'I'</b></li>
-      </ul>
-    </div>
+        <h5>MOBILE/MOUSE</h5>
+        <li class='nodot'><span class="key">TOP</span> start scrolling / reverse scrolling</li>
+        <li class='nodot'><span class="key">BOTTOM</span> Next Picture </li>
+        <li class='nodot'><span class="key">LEFT</span> Fullscreen <span class="key">RIGHT</span> Panel Mode</li>
+      </ul>    </div>
   </div>
 
   <div class='hidden' id='panel'>
diff --git a/sahli.coffee b/sahli.coffee
index 82ca412..a4cf8a0 100644
--- a/sahli.coffee
+++ b/sahli.coffee
@@ -114,7 +114,7 @@ class @Sahli
       @filedata = json.filedata
       @slides = json.slides
       @location = json.location
-      alert "SAHLI READY TO GO\n#{@filedata.length} Entries"
+      alert "SAHLI READY TO GO\n#{@filedata.length} Entries\nH for Help\nSpace to Start"
 
   @loadinfopanel = (index) ->
     data = @filedata[index]
@@ -295,11 +295,21 @@ class @Sahli
     dcol.width amt
 
   @loadkeys = ->
-    $(document).on('dblclick', (ev) =>
-      @nextpic()
-      )
+
     $(document).on('click', (ev) =>
-      @setscroll()
+      clickx = ev.clientX
+      clicky = ev.clientY
+      wh = window.innerHeight
+      ww = window.innerWidth
+      if clicky > wh-100
+        @nextpic()
+      if clicky < 100
+        @setscroll()
+      if (clicky > 100 && clicky < wh-100 )
+        if clickx < 100
+          @togglefullscreen()
+        if clickx > ww-100
+          @panelmode()
       )
     $(document).on('keydown', (ev) =>
       switch ev.which
@@ -328,7 +338,7 @@ class @Sahli
         when @keycode 'x'
           @changescrolldirection 1
         when @keycode 'c'
-          @panelmode(1)
+          @panelmode()
         when @keycode 'i'
           $('div.infobox').toggle()
         when @keycode 'v'
diff --git a/sahli.css b/sahli.css
index 12186ec..b0a213a 100644
--- a/sahli.css
+++ b/sahli.css
@@ -25,6 +25,7 @@ body {
     margin: 0;
     text-align: center;
     overflow: hidden;
+    font-family: 'microknightplus'
 }
 
 .hidden {
diff --git a/sahli.js b/sahli.js
index cd4dcc8..4dd5734 100644
--- a/sahli.js
+++ b/sahli.js
@@ -132,7 +132,7 @@ l__________/__________|___|______l__________j_____j
           _this.filedata = json.filedata;
           _this.slides = json.slides;
           _this.location = json.location;
-          return alert("SAHLI READY TO GO\n" + _this.filedata.length + " Entries");
+          return alert("SAHLI READY TO GO\n" + _this.filedata.length + " Entries\nH for Help\nSpace to Start");
         };
       })(this));
     };
@@ -346,14 +346,27 @@ l__________/__________|___|______l__________j_____j
     };
 
     Sahli.loadkeys = function() {
-      $(document).on('dblclick', (function(_this) {
-        return function(ev) {
-          return _this.nextpic();
-        };
-      })(this));
       $(document).on('click', (function(_this) {
         return function(ev) {
-          return _this.setscroll();
+          var clickx, clicky, wh, ww;
+          clickx = ev.clientX;
+          clicky = ev.clientY;
+          wh = window.innerHeight;
+          ww = window.innerWidth;
+          if (clicky > wh - 100) {
+            _this.nextpic();
+          }
+          if (clicky < 100) {
+            _this.setscroll();
+          }
+          if (clicky > 100 && clicky < wh - 100) {
+            if (clickx < 100) {
+              _this.togglefullscreen();
+            }
+            if (clickx > ww - 100) {
+              return _this.panelmode();
+            }
+          }
         };
       })(this));
       return $(document).on('keydown', (function(_this) {
@@ -384,7 +397,7 @@ l__________/__________|___|______l__________j_____j
             case _this.keycode('x'):
               return _this.changescrolldirection(1);
             case _this.keycode('c'):
-              return _this.panelmode(1);
+              return _this.panelmode();
             case _this.keycode('i'):
               return $('div.infobox').toggle();
             case _this.keycode('v'):
