diff options
| -rw-r--r-- | web/index.html | 12 | ||||
| -rw-r--r-- | 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 @@ </head> <body> <div id="title">Photos</div> -<div id="album-view"> - <div id="thumbs"> - <div id="loading">Loading...</div> - </div> - <div id="subalbums"></div> -</div> <div id="photo-view"> <div id="photo-box"> <a id="next-photo"><img id="photo" /></a> @@ -30,6 +24,12 @@ <a id="back">‹</a> <a id="next">›</a> </div> +<div id="album-view"> + <div id="thumbs"> + <div id="loading">Loading...</div> + </div> + <div id="subalbums"></div> +</div> <div id="error-overlay"></div> <div id="error-text">Forgot my camera.</div> 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; |