mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed 

#6307 fix page title not changed (stable12)
This commit is contained in:
Morris Jobke 2017-10-30 12:58:17 +01:00 committed by GitHub
parent 76ede89b6b 8eb47de969
commit 0ce718796e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/js/filelist.js
View File

@ -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);
},

4
apps/files/tests/js/filelistSpec.js
View File

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

3
apps/systemtags/js/systemtagsfilelist.js
View File

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