From dc8897cdcc4f37ab12f49786d35ab08dccacea21 Mon Sep 17 00:00:00 2001
From: Felix Heidecke <felix@heidecke.me>
Date: Mon, 14 Aug 2017 18:18:13 +0200
Subject: [PATCH] Highlight files after setFiles

---
 apps/files/js/filelist.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 177561ae0bbd..7f37c74e64b5 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -145,6 +145,12 @@
 		 */
 		_filter: '',
 
+		/**
+		 * File to be highlighted in view
+		 * @type String
+		 */
+		_scrollTo: null,
+
 		/**
 		 * @type Backbone.Model
 		 */
@@ -209,7 +215,9 @@
 			if (this.initialized) {
 				return;
 			}
-
+			if (options.scrollTo) {
+				this._scrollTo = options.scrollTo;
+			}
 			if (options.config) {
 				this._filesConfig = options.config;
 			} else if (!_.isUndefined(OCA.Files) && !_.isUndefined(OCA.Files.App)) {
@@ -332,12 +340,6 @@
 
 			this.$container.on('scroll', _.bind(this._onScroll, this));
 
-			if (options.scrollTo) {
-				this.$fileList.one('updated', function() {
-					self.scrollTo(options.scrollTo);
-				});
-			}
-
 			if (options.enableUpload) {
 				// TODO: auto-create this element
 				var $uploadEl = this.$el.find('#file_upload_start');
@@ -1033,6 +1035,13 @@
 			_.defer(function() {
 				self.$el.closest('#app-content').trigger(jQuery.Event('apprendered'));
 			});
+
+			if (this._scrollTo) {
+				this.$fileList.on('updated', function() {
+					self.scrollTo(self._scrollTo);
+					self._scrollTo = null;
+				});
+			}
 		},
 
 		/**