From a6dceb2e64d411380bc7beaed68614564cb77249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 6 Sep 2018 09:34:01 +0200
Subject: [PATCH] Fix eslint errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .eslintrc.yml                       |  1 +
 js/controller/ActivityController.js |  2 +-
 js/service/ActivityService.js       | 30 ++++++++++++++++-------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 3e973a590..fed0e4eb0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,6 +6,7 @@ extends:
 env:
   browser: true
   amd: true
+  es6: true
 
 globals:
   global: false
diff --git a/js/controller/ActivityController.js b/js/controller/ActivityController.js
index f13c37400..f2f46a5dc 100644
--- a/js/controller/ActivityController.js
+++ b/js/controller/ActivityController.js
@@ -73,7 +73,7 @@ class ActivityController {
 			}
 		};
 		_executeFetch();
-	};
+	}
 
 	page() {
 		if (!this.activityservice.since[this.type][this.element.id].finished) {
diff --git a/js/service/ActivityService.js b/js/service/ActivityService.js
index cd66ab8e2..fea97b38b 100644
--- a/js/service/ActivityService.js
+++ b/js/service/ActivityService.js
@@ -44,14 +44,16 @@ class ActivityService {
 			deck_board: {
 
 			},
-		}
+		};
 	}
 
 	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;
-		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;
+		}
 	}
 
 	fetchCardActivities(type, id, since) {
@@ -60,17 +62,17 @@ class ActivityService {
 		this.checkData(type, id);
 		var self = this;
 		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) {
-				let item = objects[index];
-				self.addItem(type, id, item);
-				if (item.activity_id > self.since[type][id].latest) {
-					self.since[type][id].latest = item.activity_id;
+				if (objects.hasOwnProperty(index)) {
+					let item = objects[index];
+					self.addItem(type, id, item);
+					if (item.activity_id > self.since[type][id].latest) {
+						self.since[type][id].latest = item.activity_id;
+					}
 				}
 			}
-			var dataLengthAfter = self.data[type][id].length;
 			self.data[type][id].sort(function(a, b) {
 				return b.activity_id - a.activity_id;
 			});
@@ -147,8 +149,10 @@ class ActivityService {
 
 			let data = [];
 			for (let index in objects) {
-				let item = objects[index];
-				self.addItem(type, id, item);
+				if (objects.hasOwnProperty(index)) {
+					let item = objects[index];
+					self.addItem(type, id, item);
+				}
 			}
 			self.data[type][id].sort(function(a, b) {
 				return b.activity_id - a.activity_id;
@@ -172,7 +176,7 @@ class ActivityService {
 		return this.data[type][id];
 	}
 
-};
+}
 
 app.service('ActivityService', ActivityService);