yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity

Fix tmp playlist delete, ajax artist edit refresh and similar artists loading

Browse source
This commit is contained in:
Afterster 2014-08-12 07:57:13 +02:00
parent e3d046974f
commit 94eba90f46
4 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/javascript/base.js
View file

@ -18,6 +18,11 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
$(document).ready(function () {
initTabs();
});
function initTabs()
{
$('.default_hidden').hide();
$("#tabs li").click(function() {
@ -29,7 +34,7 @@ $(document).ready(function () {
return false;
});
});
}
$(function() {
var rightmenu = $("#rightbar");

13
lib/javascript/dynamicpage.js
View file

@ -11,6 +11,7 @@ function loadContentData(data, status, jqXHR)
});
});
$("a[rel^='prettyPhoto']").prettyPhoto({social_tools:false});
initTabs();
}
function loadContentPage(url)
@ -34,11 +35,11 @@ $(function() {
var link = $(this).attr("href");
if (link != "" && link.indexOf("javascript:") != 0 && link != "#" && link != undefined && $(this).attr("onclick") == undefined && $(this).attr("rel") != "nohtml" && $(this).attr("target") != "_blank") {
if ($(this).attr("rel") != "prettyPhoto") {
// Ajax load Ampache pages only
if (link.indexOf(jsWebPath) > -1) {
window.location.hash = link.substring(jsWebPath.length + 1);
return false;
}
// Ajax load Ampache pages only
if (link.indexOf(jsWebPath) > -1) {
window.location.hash = link.substring(jsWebPath.length + 1);
return false;
}
} else {
window.location.hash = $(this).attr("rel");
return false;
@ -76,8 +77,8 @@ $(function() {
newHash = window.location.hash.substring(1);
if (newHash && newHash.indexOf("prettyPhoto") != 0 && newHash.indexOf(".php") > -1) {
loadContentPage(jsWebPath + '/' + newHash);
return false;
};
return false;
});
$(window).trigger('hashchange');

7
lib/javascript/tools.js
View file

@ -196,7 +196,12 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
$('#' + parent.refreshRowPrefix + parent.editId).attr("id", parent.refreshRowPrefix + new_id);
});
} else {
location.reload(true);
var reloadp = window.location;
var hash = window.location.hash.substring(1);
if (hash && hash.indexOf('.php') > -1) {
reloadp = jsWebPath + '/' + hash;
}
loadContentPage(reloadp);
}
},
error : function(resp){