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

CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background.

This commit is contained in:
Naomi 2013-04-30 17:03:40 -04:00
parent 2a1ac0ddb9
commit f82659d582
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1150,6 +1150,13 @@ var AIRTIME = (function(AIRTIME){
playlistEditor, playlistEditor,
id1, id2; id1, id2;
function removeDialog() {
playlistEditor.stop();
$html.dialog("destroy");
$html.remove();
}
if ($fadeOut.length > 0) { if ($fadeOut.length > 0) {
tracks.push({ tracks.push({
@ -1202,15 +1209,15 @@ var AIRTIME = (function(AIRTIME){
width: dim.width - 100, width: dim.width - 100,
height: dim.height - 100, height: dim.height - 100,
buttons: [ buttons: [
{text: "Cancel", click: function() { {text: "Cancel", click: removeDialog},
$(this).dialog("destroy");
}},
{text: "Save", click: function() { {text: "Save", click: function() {
var json = playlistEditor.getJson(), var json = playlistEditor.getJson(),
offset, offset,
fadeIn, fadeOut, fadeIn, fadeOut,
fade; fade;
playlistEditor.stop();
if (json.length === 1) { if (json.length === 1) {
fade = json[0]["fades"][0]; fade = json[0]["fades"][0];
@ -1251,7 +1258,8 @@ var AIRTIME = (function(AIRTIME){
playlistEditor = new PlaylistEditor(); playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config); playlistEditor.setConfig(config);
playlistEditor.init(tracks); playlistEditor.init(tracks);
} },
close: removeDialog
}); });
}; };
@ -1267,7 +1275,15 @@ var AIRTIME = (function(AIRTIME){
}], }],
cueIn = $li.find('.spl_cue_in').data("cueIn"), cueIn = $li.find('.spl_cue_in').data("cueIn"),
cueOut = $li.find('.spl_cue_out').data("cueOut"), cueOut = $li.find('.spl_cue_out').data("cueOut"),
dim = AIRTIME.utilities.findViewportDimensions(); dim = AIRTIME.utilities.findViewportDimensions(),
playlistEditor;
function removeDialog() {
playlistEditor.stop();
$html.dialog("destroy");
$html.remove();
}
$html.find('.editor-cue-in').val(cueIn); $html.find('.editor-cue-in').val(cueIn);
$html.find('.editor-cue-out').val(cueOut); $html.find('.editor-cue-out').val(cueOut);
@ -1292,13 +1308,13 @@ var AIRTIME = (function(AIRTIME){
width: dim.width - 100, width: dim.width - 100,
height: dim.height - 100, height: dim.height - 100,
buttons: [ buttons: [
{text: "Cancel", click: function() { {text: "Cancel", click: removeDialog},
$(this).dialog("destroy");
}},
{text: "Save", click: function() { {text: "Save", click: function() {
var cueIn = $html.find('.editor-cue-in').val(), var cueIn = $html.find('.editor-cue-in').val(),
cueOut = $html.find('.editor-cue-out').val(); cueOut = $html.find('.editor-cue-out').val();
playlistEditor.stop();
changeCues($html, id, cueIn, cueOut); changeCues($html, id, cueIn, cueOut);
}} }}
], ],
@ -1313,10 +1329,11 @@ var AIRTIME = (function(AIRTIME){
timeFormat: 'hh:mm:ss.u' timeFormat: 'hh:mm:ss.u'
}); });
var playlistEditor = new PlaylistEditor(); playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config); playlistEditor.setConfig(config);
playlistEditor.init(tracks); playlistEditor.init(tracks);
} },
close: removeDialog
}); });
}; };