changed cue in edit to happen when cliplength clicked to avoid event problems with moving playlist items.

This commit is contained in:
naomiaro 2011-01-16 20:40:34 -05:00
parent 8887ce24d1
commit 9b4f9c8aa4
4 changed files with 53 additions and 16 deletions

View file

@ -33,13 +33,14 @@ function openFadeEditor(event) {
function openCueEditor(event) {
event.stopPropagation();
var pos, url;
var pos, url, li;
pos = $(this).attr("id").split("_").pop();
li = $(this).parent();
pos = li.attr("id").split("_").pop();
url = '/Playlist/set-cue/format/json';
url = url + '/pos/' + pos;
highlightActive(this);
highlightActive(li);
$.get(url, setEditorContent);
}
@ -57,10 +58,14 @@ function setSPLContent(json) {
.append(json.length);
$('#spl_sortable').empty()
.append(json.html);
$("#spl_editor")
.empty();
$(".ui-icon-close").click(deleteSPLItem);
$(".spl_fade_control").click(openFadeEditor);
$("#spl_sortable li").click(openCueEditor);
$(".spl_playlength").click(openCueEditor);
return false;
}
function addSPLItem(event, ui){
@ -95,7 +100,7 @@ function deleteSPLItem(event){
function moveSPLItem(event, ui) {
var li, newPos, oldPos, url;
li = ui.item;
newPos = li.index();
@ -135,7 +140,7 @@ function newSPL() {
$.post(url, function(json){
var submit;
submit = $('<span>Submit</span>')
submit = $('<button>Submit</button>')
.button()
.click(function(){
var url, data;
@ -195,7 +200,7 @@ function setUpSPL() {
$(".ui-icon-close").click(deleteSPLItem);
$(".spl_fade_control").click(openFadeEditor);
$("#spl_sortable li").click(openCueEditor);
$(".spl_playlength").click(openCueEditor);
$("#spl_sortable").droppable();
$("#spl_sortable" ).bind( "drop", addSPLItem);