KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed staggered, and added fading instead

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-06 16:20:02 +02:00
parent 07eeeb4cc2
commit c83489ed67
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/server.js
View File

@@ -282,9 +282,9 @@ io.on('connection', function(socket){
lists[coll].push(guid); lists[coll].push(guid);
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
} }
console.log(coll); //console.log(coll);
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ 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)) 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) 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; error = true;
} }
console.log(adminpass); //console.log(adminpass);
if(adminpass !== undefined && adminpass !== null && adminpass != "") if(adminpass !== undefined && adminpass !== null && adminpass != "")
var hash = hash_pass(adminpass); var hash = hash_pass(adminpass);
@@ -327,9 +327,9 @@ io.on('connection', function(socket){
var hash = ""; var hash = "";
db.collection(coll).find({views: {$exists:true}}, function(err, docs){ db.collection(coll).find({views: {$exists:true}}, function(err, docs){
console.log(adminpass); //console.log(adminpass);
console.log(docs[0]["adminpass"]); //console.log(docs[0]["adminpass"]);
console.log(error); //console.log(error);
if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || 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 if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10

4
static/css/style.css
View File

@@ -109,8 +109,8 @@ display: inline;
height: 120px; height: 120px;
} }
#chan-card{ #channels{
opacity: 0; display: none;
} }
.white-bg{ .white-bg{

2
static/js/lib/materialize.js vendored
View File

@@ -2924,7 +2924,7 @@ $(document).ready(function(){
easing: 'easeOutSine' easing: 'easeOutSine'
}); });
$(element).velocity({opacity: 1}, { $(element).velocity({opacity: 1}, {
duration: 1300, duration: 650,
queue: false, queue: false,
easing: 'swing', easing: 'swing',
step: function(now, fx) { step: function(now, fx) {

3
static/js/nochan.js
View File

@@ -50,7 +50,8 @@ function populate_channels(lists)
} }
document.getElementById("preloader").style.display = "none"; document.getElementById("preloader").style.display = "none";
document.getElementById("searches").innerHTML = output; document.getElementById("searches").innerHTML = output;
Materialize.showStaggeredList('#channels'); //Materialize.fadeInImage('#channels');
$("#channels").fadeIn(800);
$("#search").focus(); $("#search").focus();
} }