diff options
author | Bernd Stellwag <burned@zerties.org> | 2017-10-18 19:51:40 +0200 |
---|---|---|
committer | Bernd Stellwag <burned@zerties.org> | 2017-10-27 17:32:00 +0200 |
commit | bf3f86f1ff9340ae2c1d02bf399769322626ad6d (patch) | |
tree | e53c7f078bf0e8378d80503e2a1d54b7fd128aba | |
parent | 85f612c81931c6cf1ecba76afbb63f3cf3177c4b (diff) | |
download | nextcloud-server-bf3f86f1ff9340ae2c1d02bf399769322626ad6d.tar.gz nextcloud-server-bf3f86f1ff9340ae2c1d02bf399769322626ad6d.zip |
bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
-rw-r--r-- | apps/files/js/filelist.js | 1 | ||||
-rw-r--r-- | apps/files/tests/js/filelistSpec.js | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index a458e1e0183..a94d0ac7281 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1635,6 +1635,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 3b82e146638..993038abefb 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1523,7 +1523,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(); |