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

CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor.

Browse source
This commit is contained in:
Naomi 2013-04-16 17:24:30 -04:00
parent 13c8e5f146
commit 0385285741
3 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

74
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -1064,10 +1064,6 @@ var AIRTIME = (function(AIRTIME){
mod.showFadesWaveform = function(e) {
var $el = $(e.target),
$parent = $el.parent(),
trackEditor = new TrackEditor(),
audioControls = new AudioControls(),
trackElem,
config,
$html = $($("#tmpl-pl-fades").html()),
tracks = [
{
@ -1078,8 +1074,6 @@ var AIRTIME = (function(AIRTIME){
}
];
//$el.replaceWith(html);
$html.dialog({
modal: true,
title: "Fade Editor",
@ -1090,38 +1084,34 @@ var AIRTIME = (function(AIRTIME){
buttons: [
//{text: "Submit", click: function() {doSomething()}},
{text: "Cancel", click: function() {$(this).dialog("close");}}
]
});
config = new Config({
resolution: 15000,
state: "shift",
mono: true,
waveHeight: 80,
container: $html[0],
UITheme: "jQueryUI"
});
var playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config);
playlistEditor.init(tracks);
],
open: function (event, ui) {
var config = new Config({
resolution: 15000,
state: "shift",
mono: true,
waveHeight: 80,
container: $html[0],
UITheme: "jQueryUI"
});
var playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config);
playlistEditor.init(tracks);
}
});
};
mod.showCuesWaveform = function(e) {
var $el = $(e.target),
$parent = $el.parent(),
uri = $parent.data("uri"),
trackEditor = new TrackEditor(),
audioControls = new AudioControls(),
trackElem,
config,
$html = $($("#tmpl-pl-cues").html()),
tracks = [{
src: uri
}];
//$el.replaceWith(html);
$html.dialog({
modal: true,
title: "Cue Editor",
@ -1132,20 +1122,22 @@ var AIRTIME = (function(AIRTIME){
buttons: [
//{text: "Submit", click: function() {doSomething()}},
{text: "Cancel", click: function() {$(this).dialog("close");}}
]
});
config = new Config({
resolution: 15000,
mono: true,
waveHeight: 80,
container: $html[0],
UITheme: "jQueryUI"
});
var playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config);
playlistEditor.init(tracks);
],
open: function (event, ui) {
var config = new Config({
resolution: 15000,
mono: true,
waveHeight: 80,
container: $html[0],
UITheme: "jQueryUI"
});
var playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config);
playlistEditor.init(tracks);
}
});
};
mod.init = function() {