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

Fix eslint errors

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-06 09:34:01 +02:00
parent eea5803ae5
commit a6dceb2e64
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.yml
View File

@@ -6,6 +6,7 @@ extends:
env: env:
browser: true browser: true
amd: true amd: true
es6: true
globals: globals:
global: false global: false

2
js/controller/ActivityController.js
View File

@@ -73,7 +73,7 @@ class ActivityController {
} }
}; };
_executeFetch(); _executeFetch();
}; }
page() { page() {
if (!this.activityservice.since[this.type][this.element.id].finished) { if (!this.activityservice.since[this.type][this.element.id].finished) {

18
js/service/ActivityService.js
View File

@@ -44,15 +44,17 @@ class ActivityService {
deck_board: { deck_board: {
}, },
} };
} }
static getUrl(type, id, since) { static getUrl(type, id, since) {
if (type === DECK_ACTIVITY_TYPE_CARD) if (type === DECK_ACTIVITY_TYPE_CARD) {
return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'filter?format=json&object_type=deck_card&object_id=' + id + '&limit=5&since=' + since; return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'filter?format=json&object_type=deck_card&object_id=' + id + '&limit=5&since=' + since;
if (type === DECK_ACTIVITY_TYPE_BOARD) }
if (type === DECK_ACTIVITY_TYPE_BOARD) {
return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'deck?format=json&limit=5&since=' + since; return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'deck?format=json&limit=5&since=' + since;
} }
}
fetchCardActivities(type, id, since) { fetchCardActivities(type, id, since) {
this.running = true; this.running = true;
@@ -60,17 +62,17 @@ class ActivityService {
this.checkData(type, id); this.checkData(type, id);
var self = this; var self = this;
return this.$http.get(ActivityService.getUrl(type, id, since)).then(function (response) { return this.$http.get(ActivityService.getUrl(type, id, since)).then(function (response) {
var objects = response.data.ocs.data; const objects = response.data.ocs.data;
var dataLengthBefore = self.data[type][id].length;
for (let index in objects) { for (let index in objects) {
if (objects.hasOwnProperty(index)) {
let item = objects[index]; let item = objects[index];
self.addItem(type, id, item); self.addItem(type, id, item);
if (item.activity_id > self.since[type][id].latest) { if (item.activity_id > self.since[type][id].latest) {
self.since[type][id].latest = item.activity_id; self.since[type][id].latest = item.activity_id;
} }
} }
var dataLengthAfter = self.data[type][id].length; }
self.data[type][id].sort(function(a, b) { self.data[type][id].sort(function(a, b) {
return b.activity_id - a.activity_id; return b.activity_id - a.activity_id;
}); });
@@ -147,9 +149,11 @@ class ActivityService {
let data = []; let data = [];
for (let index in objects) { for (let index in objects) {
if (objects.hasOwnProperty(index)) {
let item = objects[index]; let item = objects[index];
self.addItem(type, id, item); self.addItem(type, id, item);
} }
}
self.data[type][id].sort(function(a, b) { self.data[type][id].sort(function(a, b) {
return b.activity_id - a.activity_id; return b.activity_id - a.activity_id;
}); });
@@ -172,7 +176,7 @@ class ActivityService {
return this.data[type][id]; return this.data[type][id];
} }
}; }
app.service('ActivityService', ActivityService); app.service('ActivityService', ActivityService);