diff options
| author | Robin Appelman <robin@icewind.nl> | 2022-04-07 18:05:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 18:05:47 +0000 |
| commit | 60f946aba5862102a81100b09e26b37b6d59a3fa (patch) | |
| tree | c99627353e5512a944055d59ae47502f7bdce442 | |
| parent | 0f924e086aa5581ded9f29286e776f60e280ac78 (diff) | |
| parent | 6c04076a85ceee6222e0efd11a96c5e3a70276f8 (diff) | |
| download | nextcloud-server-60f946aba5862102a81100b09e26b37b6d59a3fa.tar.gz nextcloud-server-60f946aba5862102a81100b09e26b37b6d59a3fa.zip | |
Merge pull request #31832 from nextcloud/firefox-reload-filelist
fix filelist not loading after refresh in firefox
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4d65723bb3e..69322273a11 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -791,7 +791,7 @@ 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) { + if(this._currentDirectory && currentDir === e.dir) { return; } this.changeDirectory(e.dir, true, true, undefined, true); diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 8f2ef97b782..d35b3a19b9c 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -3442,6 +3442,7 @@ describe('OCA.Files.FileList tests', function() { beforeEach(function() { fileListStub = sinon.stub(OCA.Files.FileList.prototype, 'changeDirectory'); + fileList._currentDirectory = '/subdir'; }); afterEach(function() { fileListStub.restore(); |