diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-26 00:19:52 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-26 00:19:52 +0100 |
| commit | dac443680748f5bd482ad2a0ce231ec89b34981c (patch) | |
| tree | 9d4cf03d0fc19a9dec2d27df12a285bf9455e809 | |
| parent | 6880160749edb11250d018f169e7705b7dac78c1 (diff) | |
| parent | b3de3d72452b4eb91b4a9a4c96ccf51d914246ea (diff) | |
| download | nextcloud-server-dac443680748f5bd482ad2a0ce231ec89b34981c.tar.gz nextcloud-server-dac443680748f5bd482ad2a0ce231ec89b34981c.zip | |
Merge pull request #15170 from owncloud/middleclickbreadcrumb
Fix middle click on breadcrumb
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 871c42ead89..f55e73b434b 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -466,11 +466,11 @@ var $el = $(e.target).closest('.crumb'), $targetDir = $el.data('dir'); - if ($targetDir !== undefined) { + if ($targetDir !== undefined && e.which === 1) { e.preventDefault(); this.changeDirectory($targetDir); + this.updateSearch(); } - this.updateSearch(); }, /** diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index d44365f6351..bd3620e4b30 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1309,7 +1309,7 @@ describe('OCA.Files.FileList tests', function() { fileList.changeDirectory('/subdir/two/three with space/four/five'); fakeServer.respond(); var changeDirStub = sinon.stub(fileList, 'changeDirectory'); - fileList.breadcrumb.$el.find('.crumb:eq(0)').click(); + fileList.breadcrumb.$el.find('.crumb:eq(0)').trigger({type: 'click', which: 1}); expect(changeDirStub.calledOnce).toEqual(true); expect(changeDirStub.getCall(0).args[0]).toEqual('/'); @@ -1319,7 +1319,7 @@ describe('OCA.Files.FileList tests', function() { fileList.changeDirectory('/subdir/two/three with space/four/five'); fakeServer.respond(); var changeDirStub = sinon.stub(fileList, 'changeDirectory'); - fileList.breadcrumb.$el.find('.crumb:eq(3)').click(); + fileList.breadcrumb.$el.find('.crumb:eq(3)').trigger({type: 'click', which: 1}); expect(changeDirStub.calledOnce).toEqual(true); expect(changeDirStub.getCall(0).args[0]).toEqual('/subdir/two/three with space'); |