specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Bugfix youtube search

Browse source
This commit is contained in:
calzoneman 2013-04-04 15:55:43 -05:00
parent 66dde5f337
commit fc1c5d4896
3 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database.js
View file

@ -180,7 +180,6 @@ exports.lookupChannelRank = function(channame, username) {
var query = "SELECT * FROM chan_{1}_ranks WHERE name='{2}'" var query = "SELECT * FROM chan_{1}_ranks WHERE name='{2}'"
.replace("{1}", channame) .replace("{1}", channame)
.replace("{2}", username); .replace("{2}", username);
console.log(query);
var results = db.querySync(query); var results = db.querySync(query);
if(!results) { if(!results) {
return Rank.Guest; return Rank.Guest;

8
www/assets/js/callbacks.js
View file

@ -302,8 +302,12 @@ function initCallbacks() {
var ul = $("#library")[0]; var ul = $("#library")[0];
for(var i = 0; i < data.results.length; i++) { for(var i = 0; i < data.results.length; i++) {
var li = makeQueueEntry(data.results[i]); var li = makeQueueEntry(data.results[i]);
if(RANK >= Rank.Moderator || OPENQUEUE || LEADER) if(RANK >= Rank.Moderator || OPENQUEUE || LEADER) {
addLibraryButtons(li, data.results[i].id); if(data.results[i].thumb)
addLibraryButtons(li, data.results[i].id, true);
else
addLibraryButtons(li, data.results[i].id);
}
$(li).appendTo(ul); $(li).appendTo(ul);
} }
}); });

36
www/assets/js/functions.js
View file

@ -265,7 +265,7 @@ function rebuildPlaylist() {
} }
// Add buttons to a list entry for the library search results // Add buttons to a list entry for the library search results
function addLibraryButtons(li, id) { function addLibraryButtons(li, id, yt) {
var btnstrip = $("<div />").attr("class", "btn-group qe_buttons").prependTo(li); var btnstrip = $("<div />").attr("class", "btn-group qe_buttons").prependTo(li);
@ -281,17 +281,35 @@ function addLibraryButtons(li, id) {
// Callback time // Callback time
$(btnNext).click(function() { $(btnNext).click(function() {
socket.emit("queue", { if(yt) {
id: id, socket.emit("queue", {
pos: "next" id: id,
}); pos: "next",
type: "yt"
});
}
else {
socket.emit("queue", {
id: id,
pos: "next"
});
}
}); });
$(btnEnd).click(function() { $(btnEnd).click(function() {
socket.emit("queue", { if(yt) {
id: id, socket.emit("queue", {
pos: "end" id: id,
}); pos: "end",
type: "yt"
});
}
else {
socket.emit("queue", {
id: id,
pos: "end"
});
}
}); });
} }