mirror of
https://github.com/Yetangitu/ampache
synced 2025-10-03 09:49:30 +02:00
Merge branch 'master' of https://github.com/ampache-doped/ampache
Conflicts: lib/class/ajax.class.php lib/general.lib.php themes/fresh/templates/default.css
This commit is contained in:
commit
f4d7b64fd0
398 changed files with 33598 additions and 4616 deletions
|
@ -87,23 +87,36 @@ function check_inline_song_edit(type, song) {
|
|||
}
|
||||
}
|
||||
|
||||
function showAddTagDialog(id, type, path) {
|
||||
$('#dialog_tag_item').dialog({
|
||||
modal: true,
|
||||
buttons: [
|
||||
{
|
||||
title: "Tag",
|
||||
text: 'ok',
|
||||
click: function () {
|
||||
var tagName = $('#dialog_tag_item_tag_name').val();
|
||||
if (tagName != null || tagName != '') {
|
||||
ajaxPut(path + '/server/ajax.server.php?page=tag&action=add_tag_by_name&type=' + type + '&object_id=' + id + '&tag_name=' + tagName);
|
||||
}
|
||||
$('#dialog_tag_item_tag_name').val('');
|
||||
$(this).dialog('close');
|
||||
}
|
||||
}
|
||||
]
|
||||
}).show();
|
||||
function showAddTagSlideout(elm) {
|
||||
$(elm).show(500, 'slide');
|
||||
}
|
||||
|
||||
function saveTag(id, type, path) {
|
||||
var tagName = $('#dialog_tag_item_tag_name_'+id).val();
|
||||
if (tagName != null || tagName != '') {
|
||||
ajaxPut(path + '/server/ajax.server.php?page=tag&action=add_tag_by_name&type=' + type + '&object_id=' + id + '&tag_name=' + tagName);
|
||||
}
|
||||
$('#dialog_tag_item_tag_name').val('');
|
||||
$(this).parent().hide(500, 'slide');
|
||||
}
|
||||
|
||||
function showAddTagDialog(id, type, path) {
|
||||
//$('#dialog_tag_item').dialog({
|
||||
// modal: true,
|
||||
// buttons: [
|
||||
// {
|
||||
// title: "Tag",
|
||||
// text: 'ok',
|
||||
// click: function () {
|
||||
// var tagName = $('#dialog_tag_item_tag_name').val();
|
||||
// if (tagName != null || tagName != '') {
|
||||
// ajaxPut(path + '/server/ajax.server.php?page=tag&action=add_tag_by_name&type=' + type + '&object_id=' + id + '&tag_name=' + tagName);
|
||||
// }
|
||||
// $('#dialog_tag_item_tag_name').val('');
|
||||
// $(this).dialog('close');
|
||||
// }
|
||||
// }
|
||||
// ]
|
||||
//}).show();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue