mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Merge branch 'master' into feature/song2
This commit is contained in:
@@ -64,7 +64,6 @@ function check_error_video(msg, channel) {
|
||||
for(var i = 0; i < resp.items.length; i++) {
|
||||
vid_url += resp.items[i].id.videoId + ",";
|
||||
}
|
||||
|
||||
request({
|
||||
type: "GET",
|
||||
url: vid_url
|
||||
|
||||
@@ -982,7 +982,7 @@ var List = {
|
||||
}
|
||||
|
||||
}).error(function (xhr, errorType, exception) {
|
||||
var errorMessage = exception || xhr.statusText || xhr.responseText;
|
||||
//var errorMessage = exception || xhr.statusText || xhr.responseText;
|
||||
setTimeout(function() {
|
||||
socket.emit("error_video", {channel: chan.toLowerCase(), id: video_id, title: video_title});
|
||||
}, 500);
|
||||
@@ -1036,6 +1036,7 @@ var List = {
|
||||
return index;
|
||||
}
|
||||
});
|
||||
|
||||
return indexes[0];
|
||||
} catch(e) {}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user