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 socket error on frontpage

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-01 21:57:59 +01:00
parent 06c0aa5b7c
commit dbfa2586a4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
static/dist/frontpage.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
static/js/nochan.js
View File

@@ -3,6 +3,7 @@
var channel_list; var channel_list;
var git_info; var git_info;
var frontpage = true; var frontpage = true;
var socket;
/* /*
function getCookie(cname) { function getCookie(cname) {
@@ -240,7 +241,7 @@ var Nochan = {
window.onpopstate = function(e){ window.onpopstate = function(e){
var url_split = window.location.href.split("/"); var url_split = window.location.href.split("/");
if(url_split[3] != "" && url_split[3].substring(0,1) != "#"){ if(url_split[3] != "" && (url_split[3].substring(0,1) != "#" || url_split[3] == "#!")){
Nochan.to_channel(url_split[3], true); Nochan.to_channel(url_split[3], true);
} }
} }
@@ -271,7 +272,7 @@ function initfp(){
if(window.location.hostname == "zoff.no") add = "https://zoff.no"; if(window.location.hostname == "zoff.no") add = "https://zoff.no";
else add = "localhost"; else add = "localhost";
var socket = io.connect(''+add+':8880', connection_options); socket = io.connect(''+add+':8880', connection_options);
socket.emit('frontpage_lists'); socket.emit('frontpage_lists');
socket.on('playlists', function(msg){ socket.on('playlists', function(msg){
Nochan.populate_channels(msg); Nochan.populate_channels(msg);