KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-29 05:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

more options for nochan socket

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-11-27 15:33:03 +01:00
parent 3d4d7e2b16
commit eaf8dd7967
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
static/js/listeners.js
View File

@@ -44,9 +44,9 @@ var connection_options = {
'secure': true 'secure': true
}; };
if(window.location.hostname == "zoff.no") add = "dev.zoff.no"; if(window.location.hostname == "zoff.no") add = "https://dev.zoff.no";
else add = "localhost"; else add = "localhost";
var socket = io.connect('https://'+add+':8880', connection_options); var socket = io.connect(''+add+':8880', connection_options);
socket.on("get_list", function(){ socket.on("get_list", function(){
socket.emit('list', chan.toLowerCase()); socket.emit('list', chan.toLowerCase());
}); });

8
static/js/nochan.js
View File

@@ -178,7 +178,13 @@ $(document).ready(function (){
window.list_html = list_html; window.list_html = list_html;
$("#channels").empty(); $("#channels").empty();
var socket = io.connect('https://'+window.location.hostname+':8880'); var connection_options = {
'secure': true
};
if(window.location.hostname == "zoff.no") add = "https://dev.zoff.no";
else add = "localhost";
var 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);