fix filelist not loading after refresh in firefox

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4d65723bb3e4e7ab1ea5b02d148f736922517da1..69322273a118e65a6ff34cb93775a7905c27fc0c 100644 (file)
--- 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 8f2ef97b7822905bf6f186dd716937a15fdc16ab..d35b3a19b9c96ece70c3cf82528b67737874c547 100644 (file)
--- 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();