From 3e3e4899fa2ae5a35ea4db9e526c49b93d02d613 Mon Sep 17 00:00:00 2001
From: Bernd Stellwag <burned@zerties.org>
Date: Wed, 18 Oct 2017 19:51:40 +0200
Subject: [PATCH] bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
---
apps/files/js/filelist.js | 1 +
apps/files/tests/js/filelistSpec.js | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc23ac73979..395490d3553 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1673,6 +1673,7 @@
// close sidebar
this._updateDetailsView(null);
}
+ this._setCurrentDir(this.getCurrentDirectory(), false);
var callBack = this.reloadCallback.bind(this);
return this._reloadCall.then(callBack, callBack);
},
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 836a5e5ce71..8154ffaa7c2 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1621,7 +1621,9 @@ describe('OCA.Files.FileList tests', function() {
var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
fileList.changeDirectory('/anothersubdir');
deferredList.resolve(200, [testRoot].concat(testFiles));
- expect(fileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+ // twice because setDirectory gets called by _setCurrentDir which
+ // gets called directly by changeDirectory and via reload()
+ expect(fileList.breadcrumb.setDirectory.calledTwice).toEqual(true);
expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
setDirSpy.restore();
getFolderContentsStub.restore();
--
GitLab