From c96d629ad0944622ef7f97049a53aca567d4c4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Sat, 15 Jun 2013 08:27:33 +0200
Subject: [PATCH] Move most of javascript in util.js. Enabled paging with arrow
 keys. Refactor a little. re #73

---
 index.php                        | 29 ---------------------
 templates/default/frontpage.html |  4 +--
 util.js                          | 44 +++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/index.php b/index.php
index 51d5467..8663986 100644
--- a/index.php
+++ b/index.php
@@ -65,35 +65,6 @@
     <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
     <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("resources/normalize/normalize.css") ?>" />
     <script type="text/javascript">
-        var template, result;
-    
-        function ajaxifyLinks () {
-            if (history.pushState) {
-                $("a[href^='index']").click (function (event) {
-                    event.preventDefault(); 
-
-                    var url = $(this).attr('href');
-                    jsonurl = url.replace ("index", "getJSON");
-                    $.getJSON(jsonurl, function(data) {
-                        history.pushState(data, "", url);
-                        result = template (data);
-                        document.title = data.title;
-                        $(".container").html (result);
-                        
-                        ajaxifyLinks ();
-                    });
-                });
-            }
-        }
-        
-        window.onpopstate = function(event) {
-            //alert("location: " + document.location + ", state: " + JSON.stringify(event.state));
-            result = template (event.state);
-            document.title = event.state.title;
-            $(".container").html (result);
-                        
-            ajaxifyLinks ();
-        };
     
         $(document).ready(function() {
             // Handler for .ready() called.
diff --git a/templates/default/frontpage.html b/templates/default/frontpage.html
index 089ab57..bda2b7c 100644
--- a/templates/default/frontpage.html
+++ b/templates/default/frontpage.html
@@ -70,9 +70,9 @@
     </div>
     {{? it.isPaginated == 1}}
     <div class="footcenter">
-        {{? it.prevLink != ""}}<a href="{{=it.prevLink}}" ><img src="images/previous.png?v={{=it.version}}" alt="{{=it.i18n.previousAlt}}" /></a>{{?}}
+        {{? it.prevLink != ""}}<a id="prevLink" href="{{=it.prevLink}}" ><img src="images/previous.png?v={{=it.version}}" alt="{{=it.i18n.previousAlt}}" /></a>{{?}}
         <p> {{=it.currentPage}} / {{=it.maxPage}} </p>
-        {{? it.nextLink != ""}}<a href="{{=it.nextLink}}" ><img src="images/next.png?v={{=it.version}}" alt="{{=it.i18n.nextAlt}}" /></a>{{?}}
+        {{? it.nextLink != ""}}<a id="nextLink" href="{{=it.nextLink}}" ><img src="images/next.png?v={{=it.version}}" alt="{{=it.i18n.nextAlt}}" /></a>{{?}}
     </div>
     {{?}}
 </footer>
\ No newline at end of file
diff --git a/util.js b/util.js
index 7beab6d..3f11ce8 100644
--- a/util.js
+++ b/util.js
@@ -1,3 +1,5 @@
+var template, result;
+
 function htmlEscape(str) {
     return String(str)
             .replace(/&/g, '&amp;')
@@ -5,4 +7,44 @@ function htmlEscape(str) {
             .replace(/'/g, '&#39;')
             .replace(/</g, '&lt;')
             .replace(/>/g, '&gt;');
-}
\ No newline at end of file
+}
+
+function navigateTo (url) {
+    jsonurl = url.replace ("index", "getJSON");
+    $.getJSON(jsonurl, function(data) {
+        history.pushState(data, "", url);
+        updatePage (data);
+    });
+}
+
+function updatePage (data) {
+    result = template (data);
+    document.title = data.title;
+    $(".container").html (result);
+    
+    ajaxifyLinks ();
+}
+
+function ajaxifyLinks () {
+    if (history.pushState) {
+        $("a[href^='index']").click (function (event) {
+            event.preventDefault(); 
+
+            var url = $(this).attr('href');
+            navigateTo (url);
+        });
+    }
+}
+
+window.onpopstate = function(event) {
+    updatePage (event.state);
+};
+
+ $(document).keydown(function(e){
+    if (e.keyCode == 37 && $("#prevLink").length > 0) {
+        navigateTo ($("#prevLink").attr('href'));
+    }
+    if (e.keyCode == 39  && $("#nextLink").length > 0) {
+        navigateTo ($("#nextLink").attr('href'));
+    }
+});
\ No newline at end of file