From ed925b26014a46fa978ae9b3b7c4e47ede3b4903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 15 Apr 2015 21:13:16 +0200 Subject: [PATCH] Think everything is ready now? --- index.php | 4 +++- server/server.js | 6 +++--- static/js/admin.js | 1 + static/js/list.js | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index aacff846..751e30a5 100755 --- a/index.php +++ b/index.php @@ -14,6 +14,7 @@
+
Remove + Remove
diff --git a/server/server.js b/server/server.js index b13ebd1f..3aea3edc 100755 --- a/server/server.js +++ b/server/server.js @@ -145,7 +145,7 @@ io.on('connection', function(socket){ socket.on('vote', function(msg) { if(msg[2] == "del") - del(msg); + del(msg, socket); else { var id = msg[1]; @@ -282,14 +282,14 @@ io.on('connection', function(socket){ }); }); -function del(params) +function del(params, socket) { var coll = params[0].toLowerCase(); db.collection(coll).find({views:{$exists:true}}, function(err, docs){ if(docs[0]["adminpass"] == hash_pass(params[4])) { db.collection(coll).remove({id:params[1]}, function(err, docs){ - socket.emit("toast", "The song was deleted."); + socket.emit("toast", "Deleted song!"); sort_list(coll, undefined, false); }) } diff --git a/static/js/admin.js b/static/js/admin.js index fb9a2c35..0cd1089d 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -20,6 +20,7 @@ socket.on("pw", function(msg) for (var i = 0; i < names.length; i++) { $("input[name="+names[i]+"]").attr("disabled", false); } + $(".card-action").removeClass("hide"); }); socket.on(chan.toLowerCase()+",conf", function(msg) diff --git a/static/js/list.js b/static/js/list.js index c285dd09..1fbe1bf0 100755 --- a/static/js/list.js +++ b/static/js/list.js @@ -74,6 +74,8 @@ function populate_list(msg, conf_only) song.find(".votebg").attr("onclick", "vote('"+video_id+"','pos')"); song.find(".list-image").attr("style",video_thumb); song.attr("id",video_id); + song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')"); + if(!w_p) $(".card-action").removeClass("hide"); } });