edit panel: select pasted clips; don't print error
This commit is contained in:
parent
41d7da0b47
commit
acbba45300
1 changed files with 8 additions and 7 deletions
|
@ -198,13 +198,9 @@ pandora.ui.editPanel = function(isEmbed) {
|
||||||
out: data.key == 'out' ? data.value : clip.out
|
out: data.key == 'out' ? data.value : clip.out
|
||||||
}]));
|
}]));
|
||||||
pandora.doHistory('edit', clips, ui.edit, function(result) {
|
pandora.doHistory('edit', clips, ui.edit, function(result) {
|
||||||
if (result.status.code == 200) {
|
edit.clips[index] = result.data;
|
||||||
edit.clips[index] = result.data;
|
that.updateClip(data.id, result.data);
|
||||||
that.updateClip(data.id, result.data);
|
updateVideos();
|
||||||
updateVideos();
|
|
||||||
} else {
|
|
||||||
Ox.print('failed to edit clip', result);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -261,6 +257,11 @@ pandora.ui.editPanel = function(isEmbed) {
|
||||||
}
|
}
|
||||||
return clip;
|
return clip;
|
||||||
}).concat(result.data.clips));
|
}).concat(result.data.clips));
|
||||||
|
that.options({
|
||||||
|
selected: result.data.clips.map(function(clip) {
|
||||||
|
return clip.id;
|
||||||
|
})
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
playing: function(data) {
|
playing: function(data) {
|
||||||
|
|
Loading…
Reference in a new issue