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

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

This commit is contained in:
Martin Konecny 2011-11-11 17:26:06 -05:00
parent 42cde33648 6a22f3667f
commit 1c5b2dc813
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -260,7 +260,7 @@ function init() {
setupQtip(); setupQtip();
$('.listen-control-block').click(function() { $('.listen-control-button').click(function() {
if (stream_window == null || stream_window.closed) if (stream_window == null || stream_window.closed)
stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216'); stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
stream_window.focus(); stream_window.focus();

2
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -622,7 +622,7 @@ function setUpSPL() {
// Alert the error and reload the page // Alert the error and reload the page
// this function is used to resolve concurrency issue // this function is used to resolve concurrency issue
function alertPlaylistErrorAndReload(){ function alertPlaylistErrorAndReload(){
alert("The Playlist doesn't exist anymore!"); alert("The playlist doesn't exist anymore!");
window.location.reload(); window.location.reload();
} }