1
0

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

This commit is contained in:
Ian
2014-05-24 19:42:31 +02:00

@ -1177,7 +1177,7 @@ $(function() {
}
// Show media file info, template info, label info or filters
$('.media_show_info, .template_show_info, .filters_toolbar li > a').click(function(e) {
$('.media_show_info, .template_show_info, .filters_toolbar li > a, .toggle_info').click(function(e) {
var $el = $(this);
if ($el.attr('href')) {
$($el.attr('href')).toggleClass('additional_info');
@ -1188,15 +1188,6 @@ $(function() {
e.preventDefault();
});
$('.toggle_info').click(function(e) {
if ($(this).attr('href')) {
$($(this).attr('href')).toggleClass('additional_info');
} else {
$($(this).data('href')).toggleClass('additional_info');
}
e.preventDefault();
});
// Show further links
{if $use_popups}
if($('#dashboard').length > 0) {