Merge pull request #28843 from owncloud/stable10-files-reloadissue

[stable10] Only reload file list when switching navigation sections
owncloud · Aug 30, 2017 · 9513491 · 9513491
2 parents 17eef30 + 5c56881
commit 9513491
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
@@ -217,7 +217,8 @@
 			if (e && e.itemId) {
 				params = {
 					view: e.itemId,
-					dir: '/'
+					dir: '/',
+					force: true
 				};
 				this._changeUrl(params.view, params.dir);
 				OC.Apps.hideAppSidebar($('.detailsView'));

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -330,7 +330,6 @@
 			this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this));
 
 			this.$fileList.on('change', 'td.filename>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
-			this.$el.on('show', _.bind(this._onShow, this));
 			this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
 			this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this));
 			this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
@@ -548,22 +547,17 @@
 			this.$table.find('>thead').width($('#app-content').width() - OC.Util.getScrollBarWidth());
 		},
 
-		/**
-		 * Event handler when leaving previously hidden state
-		 */
-		_onShow: function(e) {
-			this.reload();
-		},
-
 		/**
 		 * Event handler for when the URL changed
 		 */
 		_onUrlChanged: function(e) {
 			if (e && _.isString(e.dir)) {
 				var currentDir = this.getCurrentDirectory();
 				// this._currentDirectory is NULL when fileList is first initialised
-				if( (this._currentDirectory || this.$el.find('#dir').val()) && currentDir === e.dir) {
-					return;
+				if (!e.force) {
+					if( (this._currentDirectory || this.$el.find('#dir').val()) && currentDir === e.dir) {
+						return;
+					}
 				}
 				this.changeDirectory(e.dir, false, true);
 			}

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
@@ -1501,12 +1501,6 @@ describe('OCA.Files.FileList tests', function() {
 			$('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'}));
 			expect(fileList.getCurrentDirectory()).toEqual('/somedir');
 		});
-		it('reloads the list when leaving hidden state', function() {
-			var reloadStub = sinon.stub(fileList, 'reload');
-			$('#app-content-files').trigger(new $.Event('show'));
-			expect(reloadStub.calledOnce).toEqual(true);
-			reloadStub.restore();
-		});
 		it('refreshes breadcrumb after update', function() {
 			var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
 			fileList.changeDirectory('/anothersubdir');