KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed error when browser is updated

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-11-24 11:32:51 +01:00
parent 2fc3efdc2b
commit f0ffc3d763
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

23
static/js/crypt.js
View File

@@ -3,9 +3,14 @@ var Crypt = {
conf_arr: {}, conf_arr: {},
init: function(){ init: function(){
try{
conf_arr = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt"); conf_arr = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt");
conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase()); conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
}catch(err){
console.log("err")
conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt");
conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
}
Hostcontroller.change_enabled(conf_arr.remote); Hostcontroller.change_enabled(conf_arr.remote);
}, },
@@ -15,12 +20,12 @@ var Crypt = {
} }
var decrypted = CryptoJS.AES.decrypt( var decrypted = CryptoJS.AES.decrypt(
cookie,navigator.userAgent+navigator.languages, cookie,navigator.userAgent+navigator.languages,
{ {
mode: CryptoJS.mode.CBC, mode: CryptoJS.mode.CBC,
padding: CryptoJS.pad.Pkcs7 padding: CryptoJS.pad.Pkcs7
} }
); );
return $.parseJSON(decrypted.toString(CryptoJS.enc.Utf8)); return $.parseJSON(decrypted.toString(CryptoJS.enc.Utf8));
}, },

1
static/js/listeners.js
View File

@@ -45,7 +45,6 @@ var connection_options = {
if(window.location.hostname == "zoff.no") add = "dev.zoff.no"; if(window.location.hostname == "zoff.no") add = "dev.zoff.no";
else add = "localhost"; else add = "localhost";
var socket = io.connect('http://'+add+':8880', connection_options); var socket = io.connect('http://'+add+':8880', connection_options);
socket.on("get_list", function(){ socket.on("get_list", function(){
socket.emit('list', chan.toLowerCase()); socket.emit('list', chan.toLowerCase());