mirror of
https://github.com/reality/dbot.git
synced 2024-12-24 19:52:36 +01:00
merge
This commit is contained in:
commit
24b7c2b6b4
@ -3,5 +3,6 @@
|
||||
"dependencies": [ "web", "api" ],
|
||||
"imagelength": 5,
|
||||
"nsfwwarn": true,
|
||||
"apikey": "86fd3a8da348b65"
|
||||
"apikey": "86fd3a8da348b65",
|
||||
"highscore": "ricount"
|
||||
}
|
||||
|
@ -3,7 +3,9 @@ var _ = require('underscore')._;
|
||||
var pages = function(dbot) {
|
||||
return {
|
||||
'/imgur/random': function(req, res) {
|
||||
res.render('imgurr', { });
|
||||
var hs = dbot.db.quoteArrs[dbot.config.imgur.highscore];
|
||||
hs = hs[hs.length-1];
|
||||
res.render('imgurr', {"highscore" : hs });
|
||||
},
|
||||
|
||||
'/imgur/stats': function(req, res) {
|
||||
|
@ -38,7 +38,7 @@
|
||||
width:168px;
|
||||
}
|
||||
|
||||
#history li,#loading {
|
||||
#history li,#loading,#count {
|
||||
display:block;
|
||||
font-family:monospace;
|
||||
font-size:10px;
|
||||
@ -65,18 +65,26 @@
|
||||
opacity:0.2;
|
||||
}
|
||||
|
||||
#history,#loading,#details {
|
||||
#history,#loading,#details,#count {
|
||||
position:absolute;
|
||||
}
|
||||
|
||||
#loading {
|
||||
#loading, #count {
|
||||
font-weight:500;
|
||||
}
|
||||
#loading {
|
||||
top:95px;
|
||||
left:220px;
|
||||
min-width:95px;
|
||||
top:95px;
|
||||
}
|
||||
|
||||
#loading,#details,#history li {
|
||||
#count {
|
||||
bottom:25px;
|
||||
left:25px;
|
||||
display:none;
|
||||
}
|
||||
|
||||
#loading,#details,#history li,#count {
|
||||
background:rgba(43,43,43,0.8);
|
||||
border-radius:5px;
|
||||
color:#85bf25;
|
||||
|
@ -11,6 +11,9 @@ html(lang='en')
|
||||
$('<li>'+msg+'</li>').prependTo('#history').hide().slideDown();
|
||||
}
|
||||
var lock = false
|
||||
var highscore = #{highscore} + 1;
|
||||
var score = highscore;
|
||||
$('#count').text(score);
|
||||
function getNewImage() {
|
||||
count += 1;
|
||||
lock = true;
|
||||
@ -22,6 +25,8 @@ html(lang='en')
|
||||
$.get("/api/imgur/getRandomImage", function(d) {
|
||||
$('#image').attr('src', d.data[0]);
|
||||
lock = false;
|
||||
score -= 1;
|
||||
$('#count').text(score);
|
||||
$('#details').text("Fetching info...");
|
||||
giveMessage('<a href="' + d.data[0] + '">' + d.data[0] + '</a>');
|
||||
$.get("/api/imgur/getImageInfoString", { 'slug': d.data[1] }, function(info) {
|
||||
@ -38,6 +43,10 @@ html(lang='en')
|
||||
$(getNewImage());
|
||||
$(document).on('keydown', function(e){
|
||||
switch(e.which){
|
||||
case 82: // r
|
||||
score = highscore;
|
||||
$('#count').text(highscore);
|
||||
giveMessage("Score reset.");
|
||||
case 13: // enter
|
||||
case 32: // space
|
||||
if (lock) {
|
||||
@ -48,6 +57,9 @@ html(lang='en')
|
||||
getNewImage();
|
||||
}
|
||||
break;
|
||||
case 67:
|
||||
$('#count').fadeToggle();
|
||||
break;
|
||||
case 83: // s
|
||||
$('body').toggleClass('crop');
|
||||
giveMessage("Toggled scrollbars.")
|
||||
@ -56,6 +68,8 @@ html(lang='en')
|
||||
body
|
||||
div#loading Loading image 1...
|
||||
div#details Press [SPACE] to load a new image
|
||||
div#count
|
||||
#{highscore}
|
||||
ul#history
|
||||
li Press [SPACE] for next
|
||||
div#container
|
||||
|
Loading…
Reference in New Issue
Block a user