ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 23:00:51 +03:00
Code Issues Releases Wiki Activity

фикс подгрузки в активности

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-03-07 23:14:34 +07:00
parent bf58ac0ab6
commit ffe97f4ec4
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/classes/actions/ActionStream.class.php
View file

@ -214,7 +214,6 @@ class ActionStream extends Action {
if (count($aEvents)) {
$oEvenLast=end($aEvents);
$this->Viewer_AssignAjax('sDateLast', $oEvenLast->getDateAdded());
$this->Viewer_AssignAjax('iLastId', $oEvenLast->getId());
}
/**
@ -255,7 +254,6 @@ class ActionStream extends Action {
if (count($aEvents)) {
$oEvenLast=end($aEvents);
$this->Viewer_AssignAjax('sDateLast', $oEvenLast->getDateAdded());
$this->Viewer_AssignAjax('iLastId', $oEvenLast->getId());
}
/**

4
application/frontend/common/js/activity.js
View file

@ -41,8 +41,8 @@ ls.activity = (function ($) {
$('.js-more-activity-' + sValue).more({
url: aRouter['stream'] + 'get_more_' + sValue,
target: '#activity-event-list',
afterload: function (e, data) {
data.context.element.data('param-s-date-last', data.response.sDateLast);
beforeload: function (e, context) {
context.options.params.sDateLast=$('.js-activity-event-item').last().data('dateLast');
}
});
});

4
application/frontend/skin/developer/actions/ActionStream/event_list.tpl
View file

@ -15,8 +15,8 @@
{if ! $bDisableGetMoreButton}
{include 'more.tpl'
sLoadClasses = "js-more-activity-$sActivityType"
iLoadLastId = $iStreamLastId
sLoadAttributes = "data-param-s-date-last=\"$sDateLast\""}
sLoadAttributes = " data-proxy-i-last-id=\"{$iStreamLastId}\" data-param-i-target-id=\"{$iLoadTargetId}\" "
}
{/if}
{else}
{include 'alert.tpl' mAlerts=$aLang.common.empty sAlertStyle='empty'}

10
application/frontend/skin/developer/actions/ActionStream/events.tpl
View file

@ -2,7 +2,7 @@
* События (добавлен комментарий, добавлен топик и т.д.)
*}
{$sDateLast = {date_format date=$sDateLast format="j F Y"}}
{$sDateLast = {date_format date=$sDateLast format="Y-m-d" notz=1}}
{if count($aStreamEvents)}
{foreach $aStreamEvents as $oStreamEvent}
@ -12,11 +12,11 @@
{* Дата группы событий *}
{if {date_format date=$oStreamEvent->getDateAdded() format="j F Y"} != $sDateLast}
{$sDateLast = {date_format date=$oStreamEvent->getDateAdded() format="j F Y"}}
{if {date_format date=$oStreamEvent->getDateAdded() format="Y-m-d" notz=1} != $sDateLast}
{$sDateLast = {date_format date=$oStreamEvent->getDateAdded() format="Y-m-d" notz=1}}
<li class="activity-date">
{if {date_format date=$smarty.now format="j F Y"} == $sDateLast}
{if {date_format date=$smarty.now format="Y-m-d" notz=1} == $sDateLast}
{$aLang.today}
{else}
{date_format date=$oStreamEvent->getDateAdded() format="j F Y"}
@ -25,7 +25,7 @@
{/if}
<li class="activity-event activity-event-type-{$oStreamEvent->getEventType()}">
<li class="activity-event activity-event-type-{$oStreamEvent->getEventType()} js-activity-event-item" data-date-last="{$sDateLast|escape:'html'}">
{* Аватар *}
<a href="{$oUser->getUserWebPath()}">
<img src="{$oUser->getProfileAvatarPath(48)}" alt="{$oUser->getDisplayName()}" class="activity-event-avatar" />