diff --git a/server/server.js b/server/server.js index 46f223e4..2a6ea0cb 100755 --- a/server/server.js +++ b/server/server.js @@ -282,9 +282,9 @@ io.on('connection', function(socket){ lists[coll].push(guid); io.sockets.emit(coll+",viewers", lists[coll].length); } - console.log(coll); + //console.log(coll); db.collection(coll).find({views:{$exists:true}}, function(err, docs){ - console.log(docs); + //console.log(docs); if(docs[0]["adminpass"] == "" || docs[0]["adminpass"] == hash_pass(pw)) { db.collection(coll).update({views:{$exists:true}}, {$set:{adminpass:hash_pass(pw)}}, function(err, docs) @@ -319,7 +319,7 @@ io.on('connection', function(socket){ error = true; } - console.log(adminpass); + //console.log(adminpass); if(adminpass !== undefined && adminpass !== null && adminpass != "") var hash = hash_pass(adminpass); @@ -327,9 +327,9 @@ io.on('connection', function(socket){ var hash = ""; db.collection(coll).find({views: {$exists:true}}, function(err, docs){ - console.log(adminpass); - console.log(docs[0]["adminpass"]); - console.log(error); + //console.log(adminpass); + //console.log(docs[0]["adminpass"]); + //console.log(error); if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || error) { if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10 diff --git a/static/css/style.css b/static/css/style.css index 6e64a062..3c5d2173 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -109,8 +109,8 @@ display: inline; height: 120px; } -#chan-card{ - opacity: 0; +#channels{ + display: none; } .white-bg{ diff --git a/static/js/lib/materialize.js b/static/js/lib/materialize.js index b5ecb2fe..fadb85c2 100755 --- a/static/js/lib/materialize.js +++ b/static/js/lib/materialize.js @@ -2924,7 +2924,7 @@ $(document).ready(function(){ easing: 'easeOutSine' }); $(element).velocity({opacity: 1}, { - duration: 1300, + duration: 650, queue: false, easing: 'swing', step: function(now, fx) { diff --git a/static/js/nochan.js b/static/js/nochan.js index e6fb8bc0..b7e477e7 100755 --- a/static/js/nochan.js +++ b/static/js/nochan.js @@ -50,7 +50,8 @@ function populate_channels(lists) } document.getElementById("preloader").style.display = "none"; document.getElementById("searches").innerHTML = output; - Materialize.showStaggeredList('#channels'); + //Materialize.fadeInImage('#channels'); + $("#channels").fadeIn(800); $("#search").focus(); }