From bbece26213c6fb4d8498302f54e1794084768962 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Wed, 17 Apr 2013 20:55:34 +0000 Subject: [PATCH] Convert history to list; add toggle for scrollbars * Added function to display message * Added ``s`` hotkey to toggle the scrollbar * Added ``max-width`` --- public/imgurr.css | 32 +++++++++++++++++++++++--------- views/imgur/imgurr.jade | 21 +++++++++++++++++---- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/public/imgurr.css b/public/imgurr.css index d4620ba..e7ed0b1 100644 --- a/public/imgurr.css +++ b/public/imgurr.css @@ -2,11 +2,23 @@ text-align:center; } +body.crop { + overflow:hidden; +} + +#history { + padding:0; + margin:0; +} #container,#image { margin:0; max-height:100%; + max-width:100%; padding:0; } +a { + color:inherit; +} #details { display:none; @@ -18,7 +30,7 @@ top:25px; } -#history a { +#history li { left:25px; text-align:center; width:168px; @@ -26,7 +38,7 @@ margin-bottom:15px; } -#history a,#loading { +#history li,#loading { font-family:monospace; font-size:10px; padding:10px; @@ -41,7 +53,7 @@ top:95px; } -#loading,#details,#history a { +#loading,#details,#history li { background:rgba(43,43,43,0.8); border-radius:5px; color:#85bf25; @@ -56,6 +68,8 @@ html,body { height:100%; margin:0; padding:0; + border:0; + overflow:auto; } #history { @@ -64,7 +78,7 @@ html,body { max-height:210px; overflow:hidden; } -#history a { +#history li { margin-bottom:10px; opacity:0.1; /* won't display anyway due to #history max height */ } @@ -72,18 +86,18 @@ html,body { #details { font-family:sans-serif; } -#history a:hover, #history a:nth-of-type(1) { +#history li:hover, #history li:nth-of-type(1) { opacity:1 !important; } -#history a:nth-of-type(2) { +#history li:nth-of-type(2) { opacity:0.8; } -#history a:nth-of-type(3) { +#history li:nth-of-type(3) { opacity:0.6; } -#history a:nth-of-type(4) { +#history li:nth-of-type(4) { opacity:0.4; } -#history a:nth-of-type(5) { +#history li:nth-of-type(5) { opacity:0.2; } diff --git a/views/imgur/imgurr.jade b/views/imgur/imgurr.jade index 0cb8154..fd7d7d0 100644 --- a/views/imgur/imgurr.jade +++ b/views/imgur/imgurr.jade @@ -7,6 +7,9 @@ html(lang='en') title random imgur script var count = 0; + function giveMessage(msg) { + $('
  • '+msg+'
  • ').prependTo('#history').hide().slideDown(); + } function getNewImage() { count += 1; $('#loading').fadeIn(); @@ -17,7 +20,7 @@ html(lang='en') $.get("/api/imgur/getRandomImage", function(d) { $('#image').attr('src', d.data[0]); $('#details').text("Fetching info..."); - $('' + d.data[0] + '').prependTo('#history').hide().slideDown(); + giveMessage('' + d.data[0] + ''); $.get("/api/imgur/getImageInfoString", { 'slug': d.data[1] }, function(info) { if(info.data[0].indexOf('undefined') == -1) { $("#details").text(count + ': ' + info.data[0]); @@ -30,11 +33,21 @@ html(lang='en') }, "json"); } $(getNewImage()); - $(document).on('keydown', function(e){(e.which==32)&&(getNewImage()) }); + $(document).on('keydown', function(e){ + switch(e.which){ + case 13: // enter + case 32: // space + getNewImage(); + break; + case 83: // s + $('body').toggleClass('crop'); + giveMessage("Toggled scrollbars.") + }; + }); body div#loading Loading image 1... div#details Press [SPACE] to load a new image - div#history - a Press [SPACE] for next + ul#history + li Press [SPACE] for next div#container img#image