Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2011-10-03 14:13:15 -04:00
commit 83e8a610df
34 changed files with 1695 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -249,6 +249,8 @@ function setupQtip(){
}
}
var stream_window = null;
function init() {
//begin producer "thread"
getScheduleFromServer();
@ -259,8 +261,9 @@ function init() {
setupQtip();
$('#on-air-info').click(function() {
newwindow=window.open("Dashboard/stream-player", 'name', 'width=380,height=168');
if (window.focus) {newwindow.focus()}
if (stream_window == null || stream_window.closed)
stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
stream_window.focus();
return false;
});
}