Merge pull request #6869 from burned42/6307-fix_page_title_not_changed
#6307 fix page title not changed
This commit is contained in:
commit
1f19a45a88
|
@ -1685,6 +1685,7 @@
|
||||||
// close sidebar
|
// close sidebar
|
||||||
this._updateDetailsView(null);
|
this._updateDetailsView(null);
|
||||||
}
|
}
|
||||||
|
this._setCurrentDir(this.getCurrentDirectory(), false);
|
||||||
var callBack = this.reloadCallback.bind(this);
|
var callBack = this.reloadCallback.bind(this);
|
||||||
return this._reloadCall.then(callBack, callBack);
|
return this._reloadCall.then(callBack, callBack);
|
||||||
},
|
},
|
||||||
|
|
|
@ -1627,7 +1627,9 @@ describe('OCA.Files.FileList tests', function() {
|
||||||
var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
|
var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
|
||||||
fileList.changeDirectory('/anothersubdir');
|
fileList.changeDirectory('/anothersubdir');
|
||||||
deferredList.resolve(200, [testRoot].concat(testFiles));
|
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);
|
expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
|
||||||
setDirSpy.restore();
|
setDirSpy.restore();
|
||||||
getFolderContentsStub.restore();
|
getFolderContentsStub.restore();
|
||||||
|
|
|
@ -234,6 +234,9 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
reload: function() {
|
reload: function() {
|
||||||
|
// there is only root
|
||||||
|
this._setCurrentDir('/', false);
|
||||||
|
|
||||||
if (!this._systemTagIds.length) {
|
if (!this._systemTagIds.length) {
|
||||||
// don't reload
|
// don't reload
|
||||||
this.updateEmptyContent();
|
this.updateEmptyContent();
|
||||||
|
|
Loading…
Reference in New Issue