Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2024-12-13 02:46:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2015-02-20 08:00:25 +00:00
parent 2838f1526d
commit 051ed8520e
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sections/friends/friends.php
View File

@ -13,7 +13,7 @@
View::show_header('Friends'); View::show_header('Friends','comments');
$UserID = $LoggedUser['ID']; $UserID = $LoggedUser['ID'];

4
sections/userhistory/subscriptions.php
View File

@ -10,7 +10,7 @@
} }
list($Page, $Limit) = Format::page_limit($PerPage); list($Page, $Limit) = Format::page_limit($PerPage);
View::show_header('Subscriptions','subscriptions,bbcode'); View::show_header('Subscriptions','subscriptions,comments,bbcode');
$ShowUnread = (!isset($_GET['showunread']) && !isset($HeavyInfo['SubscriptionsUnread']) || isset($HeavyInfo['SubscriptionsUnread']) && !!$HeavyInfo['SubscriptionsUnread'] || isset($_GET['showunread']) && !!$_GET['showunread']); $ShowUnread = (!isset($_GET['showunread']) && !isset($HeavyInfo['SubscriptionsUnread']) || isset($HeavyInfo['SubscriptionsUnread']) && !!$HeavyInfo['SubscriptionsUnread'] || isset($_GET['showunread']) && !!$_GET['showunread']);
$ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsCollapse']) || isset($HeavyInfo['SubscriptionsCollapse']) && !!$HeavyInfo['SubscriptionsCollapse'] || isset($_GET['collapse']) && !!$_GET['collapse']); $ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsCollapse']) || isset($HeavyInfo['SubscriptionsCollapse']) && !!$HeavyInfo['SubscriptionsCollapse'] || isset($_GET['collapse']) && !!$_GET['collapse']);
@ -230,7 +230,7 @@
<tr class="row<?=$ShowCollapsed ? ' hidden' : '' ?>"> <tr class="row<?=$ShowCollapsed ? ' hidden' : '' ?>">
<? if (Users::has_avatars_enabled()) { ?> <? if (Users::has_avatars_enabled()) { ?>
<td class="avatar" valign="top"> <td class="avatar" valign="top">
<?=Users::show_avatar($Result['LastReadAvatar'], $Result['LastReadUsername'], $HeavyInfo['DisableAvatars'])?> <?=Users::show_avatar($Result['LastReadAvatar'], $Result['LastReadUserID'], $Result['LastReadUsername'], $HeavyInfo['DisableAvatars'])?>
</td> </td>
<? } ?> <? } ?>
<td class="body" valign="top"> <td class="body" valign="top">

28
static/functions/comments.js
View File

@ -395,22 +395,36 @@ $(document).ready(function() {
var avatars = new Array(); var avatars = new Array();
$(".double_avatar").each(function() { $(".double_avatar").each(function() {
if ($(this).data("gazelle-second-avatar")) { if ($(this).data("gazelle-second-avatar")) {
$(this).data("fading", "");
var secondAvatar = $(this).data("gazelle-second-avatar"); var secondAvatar = $(this).data("gazelle-second-avatar");
var originalAvatar = $(this).attr("src"); var originalAvatar = $(this).attr("src");
if ($.inArray(secondAvatar, avatars) == -1) { if ($.inArray(secondAvatar, avatars) == -1) {
// Preload second image
avatars.push(secondAvatar); avatars.push(secondAvatar);
image = new Image(); var image = new Image();
image.src = secondAvatar; image.src = secondAvatar;
} }
$(this).mouseover(function() { $(this).mouseover(function() {
$(this).fadeOut(fadeSpeed, function() { if ($(this).data("fading") == "") {
$(this).attr("src", secondAvatar); var originalHeight = $(this).parent().height();
}).fadeIn(fadeSpeed); $(this).data("fading", "in");
$(this).fadeTo(fadeSpeed, 0, function() {
$(this).attr("src", secondAvatar);
if (!this.parentNode.style.height) {
$(this).parent().css("height", Math.max($(this).parent().height(), originalHeight) + 'px');
}
}).fadeTo(fadeSpeed, 1);
}
}); });
$(this).mouseout(function() { $(this).mouseout(function() {
$(this).fadeOut(fadeSpeed, function() { if ($(this).data("fading") != "out" && ($(this).data("fading") != "" || $(this).attr("src") != originalAvatar)) {
$(this).attr("src", originalAvatar); $(this).data("fading", "out");
}).fadeIn(fadeSpeed); $(this).fadeOut(fadeSpeed, function() {
$(this).attr("src", originalAvatar);
}).fadeIn(fadeSpeed, function() {
$(this).data("fading", "");
});
}
}); });
} }