yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 02:09:23 +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. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
$(document).ready(function () { $(document).ready(function () {
initTabs();
});
function initTabs()
{
$('.default_hidden').hide(); $('.default_hidden').hide();
$("#tabs li").click(function() { $("#tabs li").click(function() {
@ -29,7 +34,7 @@ $(document).ready(function () {
return false; return false;
}); });
}); }
$(function() { $(function() {
var rightmenu = $("#rightbar"); var rightmenu = $("#rightbar");

3
lib/javascript/dynamicpage.js
View file

@ -11,6 +11,7 @@ function loadContentData(data, status, jqXHR)
}); });
}); });
$("a[rel^='prettyPhoto']").prettyPhoto({social_tools:false}); $("a[rel^='prettyPhoto']").prettyPhoto({social_tools:false});
initTabs();
} }
function loadContentPage(url) function loadContentPage(url)
@ -76,8 +77,8 @@ $(function() {
newHash = window.location.hash.substring(1); newHash = window.location.hash.substring(1);
if (newHash && newHash.indexOf("prettyPhoto") != 0 && newHash.indexOf(".php") > -1) { if (newHash && newHash.indexOf("prettyPhoto") != 0 && newHash.indexOf(".php") > -1) {
loadContentPage(jsWebPath + '/' + newHash); loadContentPage(jsWebPath + '/' + newHash);
};
return false; return false;
};
}); });
$(window).trigger('hashchange'); $(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); $('#' + parent.refreshRowPrefix + parent.editId).attr("id", parent.refreshRowPrefix + new_id);
}); });
} else { } 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){ error : function(resp){

3
templates/rightbar.inc.php
View file

@ -107,7 +107,8 @@
$normal_array = array('live_stream', 'song', 'video', 'random', 'song_preview'); $normal_array = array('live_stream', 'song', 'video', 'random', 'song_preview');
foreach ($objects as $uid=>$object_data) { foreach ($objects as $object_data) {
$uid = $object_data['track_id'];
$type = array_shift($object_data); $type = array_shift($object_data);
if (in_array($type,$normal_array)) { if (in_array($type,$normal_array)) {
$object = new $type(array_shift($object_data)); $object = new $type(array_shift($object_data));