ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix activity rendering in the sidebar

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-07 15:04:42 +02:00
parent df4f8dda60
commit 28f58ee5f3
8 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/part.board.sidebarView.php
View File

@@ -150,7 +150,7 @@
</ul>
</div>
<div id="board-detail-activity" class="tab" ng-if="params.tab==4">
<div id="board-detail-activity" class="tab activityTabView" ng-if="params.tab==4">
<activity-component ng-if="boardservice.getCurrent()" type="deck_board" element="boardservice.getCurrent()"></activity-component>
</div>

4
templates/part.card.activity.html
View File

@@ -1,11 +1,11 @@
<ul class="activities" infinite-scroll="$ctrl.page()" infinite-scroll-container="'#app-sidebar'" infinite-scroll-disabled="$ctrl.activityservice.running">
<ul class="activities" infinite-scroll="$ctrl.page()" infinite-scroll-container="'#app-sidebar'" infinite-scroll-disabled="$ctrl.activityservice.running" infinite-scroll-immediate-check="false">
<li ng-if="$ctrl.loadingNewer()"><div class="icon-loading-small"></div></li>
<li class="activity box" ng-repeat="activity in $ctrl.getData($ctrl.element.id) track by $index">
<div class="activity-icon">
<img src="{{activity.icon}}" alt="">
</div>
<div class="activitysubject"
ng-bind-html="$ctrl.parseMessage(activity.subject_rich[0], activity.subject_rich[1])"></div>
bind-html-compile="$ctrl.parseMessage(activity.subject_rich[0], activity.subject_rich[1])"></div>
<span class="activitytime has-tooltip live-relative-timestamp"
data-timestamp="{{ activity.timestamp }}">{{ activity.timestamp/1000 | relativeDateFilter }}</span>
<div class="activitymessage" ng-bind-html="activity.message"></div>

2
templates/part.card.php
View File

@@ -131,7 +131,7 @@
</div>
</div>
<div class="section-content card-activity" ng-if="params.tab === 2">
<div class="section-content card-activity activityTabView" ng-if="params.tab === 2">
<activity-component type="deck_card" element="cardservice.getCurrent()"></activity-component>
</div>