From 99be279ae3d6991ea5c0d813ebb5aa536b7631cc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 May 2011 09:42:17 -0400 Subject: [PATCH] Put photo segment at top and trim slashes from urls. --- web/index.html | 12 ++++++------ web/js/010-control.js | 12 ++++++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/web/index.html b/web/index.html index e9b0b9a..a0b201e 100644 --- a/web/index.html +++ b/web/index.html @@ -10,12 +10,6 @@
Photos
-
-
-
Loading...
-
-
-
@@ -30,6 +24,12 @@
+
+
+
Loading...
+
+
+
Forgot my camera.
diff --git a/web/js/010-control.js b/web/js/010-control.js index 17cb8e2..f675508 100644 --- a/web/js/010-control.js +++ b/web/js/010-control.js @@ -281,10 +281,14 @@ $(document).ready(function() { var album_cache = new Array(); $(window).hashchange(function() { var new_album_cache = location.hash.substring(1); - if (new_album_cache.length && new_album_cache[0] == "!") - new_album_cache = new_album_cache.substring(1); - if (new_album_cache.length && new_album_cache[0] == "/") - new_album_cache = new_album_cache.substring(1); + if (new_album_cache.length) { + if (new_album_cache[0] == "!") + new_album_cache = new_album_cache.substring(1); + if (new_album_cache[0] == "/") + new_album_cache = new_album_cache.substring(1); + if (new_album_cache[new_album_cache.length - 1] == "/") + new_album_cache = new_album_cache.substring(0, new_album_cache.length - 1); + } var index = new_album_cache.lastIndexOf("/"); if (index != -1 && index != new_album_cache.length - 1) { previous_photo_cache = current_photo_cache;