KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying some more fixes for the unknown error for .id undefined

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-09 15:57:46 +01:00
parent 82e643140e
commit 9b7be4224a
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/public/assets/js/crypt.js
View File

@@ -57,17 +57,19 @@ var Crypt = {
}, },
decrypt_pass: function(pass) { decrypt_pass: function(pass) {
var key = btoa(socket.id) + btoa(socket.id); if(socket) {
key = key.substring(0,32); var key = btoa(socket.id) + btoa(socket.id);
key = btoa(key); key = key.substring(0,32);
var decrypted = CryptoJS.AES.decrypt( key = btoa(key);
pass,key, var decrypted = CryptoJS.AES.decrypt(
{ pass,key,
mode: CryptoJS.mode.CBC, {
padding: CryptoJS.pad.Pkcs7 mode: CryptoJS.mode.CBC,
} padding: CryptoJS.pad.Pkcs7
); }
return decrypted.toString(CryptoJS.enc.Utf8); );
return decrypted.toString(CryptoJS.enc.Utf8);
} return false;
}, },
encrypt: function(json_formated, cookie) { encrypt: function(json_formated, cookie) {

2
server/public/assets/js/frontpage.js
View File

@@ -186,7 +186,7 @@ var Frontpage = {
add_backdrop: function(list, i) { add_backdrop: function(list, i) {
if(i >= list.length || i >= 20) i = 0; if(i >= list.length || i >= 20) i = 0;
if(list[i] == undefined) return;
var id = list[i].id; var id = list[i].id;
if(Frontpage.blob_list[i] !== undefined){ if(Frontpage.blob_list[i] !== undefined){
//$(".room-namer").css("opacity", 0); //$(".room-namer").css("opacity", 0);

35
server/public/assets/js/list.js
View File

@@ -241,25 +241,26 @@ var List = {
check_error_videos: function(i) { check_error_videos: function(i) {
//Helper.log("Empty-checker at " + i); //Helper.log("Empty-checker at " + i);
$.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + full_playlist[i].id if(full_playlist.length == 0) return;
+ "&key=" + api_key + "&part=snippet", $.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + full_playlist[i].id
function (data, status, xhr) { + "&key=" + api_key + "&part=snippet",
//Helper.log("Empty-checker items " + data.items.length); function (data, status, xhr) {
if (data.items.length == 0) { //Helper.log("Empty-checker items " + data.items.length);
Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]); if (data.items.length == 0) {
socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
}
if(full_playlist.length > i + 1 && window.location.pathname != "/") {
List.check_error_videos(i + 1);
}
}).error(function (xhr, errorType, exception) {
Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]); Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]);
socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title}); socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
if(full_playlist.length > i + 1 && window.location.pathname != "/") { }
List.check_error_videos(i + 1); if(full_playlist.length > i + 1 && window.location.pathname != "/") {
} List.check_error_videos(i + 1);
}); }
}).error(function (xhr, errorType, exception) {
Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]);
socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
if(full_playlist.length > i + 1 && window.location.pathname != "/") {
List.check_error_videos(i + 1);
}
});
}, },
dynamicContentPageJumpTo: function(page) { dynamicContentPageJumpTo: function(page) {