mirror of
https://github.com/Yetangitu/ampache
synced 2025-10-05 10:49:37 +02:00
Merge branch 'master' of github.com:ampache-doped/ampache
This commit is contained in:
Afterster
commit
e7847aa440
28 changed files with 711 additions and 162 deletions
|
|
@ -46,13 +46,13 @@ function flipField(field) {
|
|||
else {
|
||||
$(field).disabled = false;
|
||||
}
|
||||
} // flipField
|
||||
}
|
||||
|
||||
// updateText
|
||||
// Changes the specified elements innards. Used for the catalog mojo fluff.
|
||||
function updateText(field, value) {
|
||||
$('#'+field).html(value);
|
||||
} // updateText
|
||||
}
|
||||
|
||||
// toggleVisible
|
||||
// Toggles display type between block and none. Used for ajax loading div.
|
||||
|
|
@ -63,7 +63,7 @@ function toggleVisible(element) {
|
|||
} else {
|
||||
target.show();
|
||||
}
|
||||
} // toggleVisible
|
||||
}
|
||||
|
||||
// delayRun
|
||||
// This function delays the run of another function by X milliseconds
|
||||
|
|
@ -79,7 +79,7 @@ function delayRun(element, time, method, page, source) {
|
|||
|
||||
element.zid = setTimeout(action, time);
|
||||
|
||||
} // delayRun
|
||||
}
|
||||
|
||||
// reloadUtil
|
||||
// Reload our util frame
|
||||
|
|
@ -87,57 +87,23 @@ function delayRun(element, time, method, page, source) {
|
|||
// Localplay, which don't actually prompt for a new file
|
||||
function reloadUtil(target) {
|
||||
$('#util_iframe').prop('src', target);
|
||||
} // reloadUtil
|
||||
}
|
||||
|
||||
// reloadRedirect
|
||||
// Send them elsewhere
|
||||
function reloadRedirect(target) {
|
||||
window.location = target;
|
||||
} // reloadRedirect
|
||||
}
|
||||
|
||||
// This is kind of ugly. Let's not mess with it too much.
|
||||
function check_inline_song_edit(type, song) {
|
||||
var target = '#' + type + '_select_' + song;
|
||||
if ($(target + ' option:selected').val() == -1) {
|
||||
$(target).replaceWith('<input type="textbox" name="' + type + '_name" value="New ' + type + '" />');
|
||||
var source = '#' + type + '_select_' + song;
|
||||
if ($(source + ' option:selected').val() == -1) {
|
||||
$(source).replaceWith('<input type="text" name="' + type + '_name" value="New ' + type + '" onclick="this.select();" />');
|
||||
|
||||
if (type == 'album') {
|
||||
$(source).replaceWith('<label for="year">Year</label><input type="text" name="year" id="year" size="5" /><label for="disk">Disk #</label><input type="text" name="disk" id="disk" size="3" />');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function showAddTagSlideout(elm) {
|
||||
$(elm).show('slide', 500);
|
||||
}
|
||||
|
||||
function closeAddTagSlideout(elm) {
|
||||
$(elm).hide('slide', 500);
|
||||
}
|
||||
|
||||
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('');
|
||||
$('#dialog_tag_item_' + id).hide('slide', 500);
|
||||
$('#np_song_tags_' + id).append('<a href="javascript:void(0);" class="hover-remove tag_size2">' + tagName + '</a>')
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
|
|
|
|||
119
lib/javascript/edit-dialog.js
Normal file
119
lib/javascript/edit-dialog.js
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
// vim:set softtabstop=4 shiftwidth=4 expandtab:
|
||||
//
|
||||
// Copyright 2001 - 2013 Ampache.org
|
||||
// All rights reserved.
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License v2
|
||||
// as published by the Free Software Foundation.
|
||||
//
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
//
|
||||
|
||||
function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, save_title, cancel_title) {
|
||||
var parent = this;
|
||||
parent.editFormId = 'form#' + edit_form_id;
|
||||
parent.contentUrl = jsAjaxUrl + '?action=show_edit_object&id=' + edit_id + '&type=' + edit_type;
|
||||
parent.saveUrl = jsAjaxUrl + '?action=edit_object&id=' + edit_id + '&type=' + edit_type;
|
||||
parent.editDialogId = '<div id="editdialog"></div>';
|
||||
|
||||
parent.dialog_buttons = {};
|
||||
this.dialog_buttons[save_title] = function() {
|
||||
$.ajax({
|
||||
url : parent.saveUrl,
|
||||
type : 'POST',
|
||||
data : $(parent.editFormId).serializeArray(),
|
||||
success : function(resp){
|
||||
$("#editdialog").dialog("close");
|
||||
// Need to replace current div instead of refreshing frame.
|
||||
window.location.reload();
|
||||
},
|
||||
error : function(resp){
|
||||
$("#editdialog").dialog("close");
|
||||
}
|
||||
});
|
||||
}
|
||||
this.dialog_buttons[cancel_title] = function() {
|
||||
$("#editdialog").dialog("close");
|
||||
}
|
||||
|
||||
$(parent.editDialogId).dialog({
|
||||
title: edit_title,
|
||||
modal: true,
|
||||
dialogClass: 'editdialogstyle',
|
||||
resizable: false,
|
||||
width: 600,
|
||||
autoOpen: false,
|
||||
open: function () {
|
||||
$(this).load(parent.contentUrl, function() {
|
||||
$(this).dialog('option', 'position', 'center');
|
||||
|
||||
if ($('#edit_tags').length > 0) {
|
||||
$("#edit_tags").tagit({
|
||||
allowSpaces: true,
|
||||
singleField: true,
|
||||
singleFieldDelimiter: ','
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
close: function (e) {
|
||||
$(this).empty();
|
||||
$(this).dialog("destroy");
|
||||
},
|
||||
buttons: dialog_buttons
|
||||
});
|
||||
|
||||
$("#editdialog").dialog("open");
|
||||
}
|
||||
|
||||
$(window).resize(function() {
|
||||
$("#editdialog").dialog("option", "position", ['center', 'center']);
|
||||
});
|
||||
|
||||
function showAddTagSlideout(elm) {
|
||||
$(elm).show('slide', 500);
|
||||
}
|
||||
|
||||
function closeAddTagSlideout(elm) {
|
||||
$(elm).hide('slide', 500);
|
||||
}
|
||||
|
||||
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('');
|
||||
$('#dialog_tag_item_' + id).hide('slide', 500);
|
||||
$('#np_song_tags_' + id).append('<a href="javascript:void(0);" class="hover-remove tag_size2">' + tagName + '</a>')
|
||||
}
|
||||
|
||||
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