upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #3686 from nextcloud/downstream-27282

Browse source 
filelist only refreshed if directory changes
This commit is contained in:
Joas Schilling 2017-03-03 11:55:53 +01:00 committed by GitHub
commit 29e9b1f3d5
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files/js/filelist.js
View file

@ -557,6 +557,11 @@
*/
_onUrlChanged: function(e) {
if (e && _.isString(e.dir)) {
var currentDir = this.getCurrentDirectory();
// this._currentDirectory is NULL when fileList is first initialised
if( (this._currentDirectory || this.$el.find('#dir').val()) && currentDir === e.dir) {
return;
}
this.changeDirectory(e.dir, false, true);
}
},

18
apps/files/tests/js/filelistSpec.js
View file

@ -3005,4 +3005,22 @@ describe('OCA.Files.FileList tests', function() {
testMountType(123, 'external-root', 'external', 'external');
});
});
describe('file list should not refresh if url does not change', function() {
var fileListStub;
beforeEach(function() {
fileListStub = sinon.stub(OCA.Files.FileList.prototype, 'changeDirectory');
});
afterEach(function() {
fileListStub.restore();
});
it('File list must not be refreshed', function() {
$('#app-content-files').trigger(new $.Event('urlChanged', {dir: '/subdir'}));
expect(fileListStub.notCalled).toEqual(true);
});
it('File list must be refreshed', function() {
$('#app-content-files').trigger(new $.Event('urlChanged', {dir: '/'}));
expect(fileListStub.notCalled).toEqual(false);
});
});
});