Merge pull request #6869 from burned42/6307-fix_page_title_not_changed

#6307 fix page title not changed
This commit is contained in:
Daniel Calviño Sánchez 2017-10-27 17:12:47 +02:00 committed by GitHub
commit 1f19a45a88
3 changed files with 7 additions and 1 deletions

View File

@ -1685,6 +1685,7 @@
// close sidebar
this._updateDetailsView(null);
}
this._setCurrentDir(this.getCurrentDirectory(), false);
var callBack = this.reloadCallback.bind(this);
return this._reloadCall.then(callBack, callBack);
},

View File

@ -1627,7 +1627,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();

View File

@ -234,6 +234,9 @@
},
reload: function() {
// there is only root
this._setCurrentDir('/', false);
if (!this._systemTagIds.length) {
// don't reload
this.updateEmptyContent();