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

25
js/controller/ActivityController.js
View File

@@ -48,7 +48,7 @@ class ActivityController {
}
parseMessage(subject, parameters) {
OCA.Activity.RichObjectStringParser._userLocalTemplate = '<avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}"></avatar>';
OCA.Activity.RichObjectStringParser._userLocalTemplate = '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters);
}
@@ -57,20 +57,19 @@ class ActivityController {
let dataLengthBefore = self.getData(self.element.id).length;
let _executeFetch = function() {
let promise = self.activityservice.fetchMoreActivities(self.type, self.element.id);
if (Promise.resolve(promise) === promise) {
promise.then(function (data) {
let dataLengthAfter = self.getData(self.element.id).length;
if (data !== null || dataLengthAfter <= dataLengthBefore || dataLengthAfter < 5) {
_executeFetch();
} else {
self.loading = false;
self.$scope.$apply();
}
}, function () {
promise.then(function (data) {
let dataLengthAfter = self.getData(self.element.id).length;
if (data !== null && (dataLengthAfter <= dataLengthBefore || dataLengthAfter < 5)) {
_executeFetch();
} else {
self.loading = false;
self.$scope.$apply();
});
}
}
}, function () {
self.loading = false;
self.$scope.$apply();
});
};
_executeFetch();
}