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

This commit is contained in:
James 2012-12-05 13:29:48 -05:00
commit efa5f6ff6c
4 changed files with 57 additions and 9 deletions

View file

@ -796,7 +796,9 @@ var AIRTIME = (function(AIRTIME) {
if (data.ftype === "audioclip") {
callback = function() {
document.location.href = oItems.edit.url;
$.get(oItems.edit.url, {format: "json"}, function(json){
buildEditMetadataDialog(json);
});
};
} else if (data.ftype === "playlist" || data.ftype === "block") {
callback = function() {
@ -940,6 +942,25 @@ var AIRTIME = (function(AIRTIME) {
}(AIRTIME || {}));
function buildEditMetadataDialog (json){
var dialog = $(json.dialog);
dialog.dialog({
autoOpen: false,
title: $.i18n._("Edit Metadata"),
width: 460,
height: 660,
modal: true,
close: closeDialog
});
dialog.dialog('open');
}
function closeDialog(event, ui) {
$(this).remove();
}
function checkImportStatus() {
$.getJSON(baseUrl+'/Preference/is-import-in-progress', function(data){
var div = $('#import_status');
@ -1234,3 +1255,18 @@ var validationTypes = {
"info_url" : "s",
"year" : "i"
};
$(document).ready(function() {
$('#editmdsave').live("click", function() {
var file_id = $('#file_id').val(),
data = $("#edit-md-dialog form").serializeArray();
$.post(baseUrl+'/library/edit-file-md', {format: "json", id: file_id, data: data}, function() {
$("#edit-md-dialog").dialog().remove();
});
});
$('#editmdcancel').live("click", function() {
$("#edit-md-dialog").dialog().remove();
});
});