From d20a83efe7dc88245b859e438d4fda63aaed861e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 7 May 2015 12:11:33 +0200 Subject: [PATCH] easter-egg added --- server/server.js | 6 +++++- static/js/youtube.js | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 14102902..7ca9406e 100755 --- a/server/server.js +++ b/server/server.js @@ -32,6 +32,10 @@ io.on('connection', function(socket){ var tot_lists = []; var in_list = false; + socket.on('chat', function (data) { + io.sockets.emit('chat,'+coll, guid + " said: " + data); + }); + socket.on('frontpage_lists', function() { var playlists_to_send = []; @@ -301,7 +305,7 @@ io.on('connection', function(socket){ //console.log(coll); db.collection(coll).find({views:{$exists:true}}, function(err, docs){ //console.log(docs); - console.log(docs + " yy here?"); + //console.log(docs + " yy here?"); if(docs.length != 0) { if(docs[0]["adminpass"] == "" || docs[0]["adminpass"] == hash_pass(pw)) diff --git a/static/js/youtube.js b/static/js/youtube.js index aeb05996..df55a2d3 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -71,8 +71,14 @@ socket.on(chan.toLowerCase()+",viewers", function(view) getTitle(song_title, viewers); }); +socket.on("chat,"+chan.toLowerCase(), function(data) +{ + console.log(data); +}); + $(document).ready(function() { + $("#settings").sideNav({ menuWidth: 300, // Default is 240 edge: 'right', // Choose the horizontal origin @@ -245,6 +251,12 @@ function notifyUser(id, title) { } } +function chat(data) +{ + socket.emit("chat", data); + return; +} + function getRandomInt(min, max) { return Math.floor(Math.random() * (max - min)) + min; }