hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:DDVTECH/DMS

Browse source
This commit is contained in:
Thulinma 2012-05-01 23:56:26 +02:00
commit 8a5a13eb2a
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
server.html
View file

@ -613,7 +613,7 @@ td
} }
}); });
//console.log('SEND', data); console.log('SEND', data);
$.ajax( $.ajax(
{ {
@ -623,7 +623,9 @@ td
"command": JSON.stringify(data) "command": JSON.stringify(data)
}, },
'dataType': 'jsonp', 'dataType': 'jsonp',
'timeout': 10000,
'timeout': 5000,
'error': function() 'error': function()
{ {
//setHeaderState('disconnected'); //setHeaderState('disconnected');
@ -631,7 +633,7 @@ td
}, },
'success': function(d) 'success': function(d)
{ {
//console.log('RECV', d); console.log('RECV', d);
if(d && d['authorize'] && d['authorize']['challenge']) if(d && d['authorize'] && d['authorize']['challenge'])
{ {
@ -1110,13 +1112,20 @@ settings.settings.config.protocols = [fobj1, fobj2, fobj3];
var cviewers = 0; var cviewers = 0;
if(settings.settings.statistics[stream] && settings.settings.statistics[stream].curr)
if(settings.settings.statistics && settings.settings.statistics[stream])
{ {
for(viewer in settings.settings.statistics[stream].curr) if(settings.settings.statistics[stream] && settings.settings.statistics[stream].curr)
{ {
cviewers++; for(viewer in settings.settings.statistics[stream].curr)
{
cviewers++;
}
} }
}else{
cviewers = 0;
} }
$tr.append( $('<td>').text( cviewers ) ); $tr.append( $('<td>').text( cviewers ) );