diff options
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 18872568ab5..1f207a2f72c 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -678,7 +678,7 @@ this.updateSelectionSummary(); } else { // clicked directly on the name - if (!this._detailsView || $(event.target).is('.nametext') || $(event.target).closest('.nametext').length) { + if (!this._detailsView || $(event.target).is('.nametext, .name') || $(event.target).closest('.nametext').length) { var filename = $tr.attr('data-file'); var renaming = $tr.data('renaming'); if (!renaming) { diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index efaf9968def..754d62204c1 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -2429,7 +2429,7 @@ describe('OCA.Files.FileList tests', function() { ); fileList.fileActions.setDefault('text/plain', 'Test'); var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); expect(actionStub.calledOnce).toEqual(true); expect(updateDetailsViewStub.notCalled).toEqual(true); updateDetailsViewStub.restore(); @@ -2437,14 +2437,14 @@ describe('OCA.Files.FileList tests', function() { it('highlights current file when clicked and updates sidebar', function() { fileList.fileActions.setDefault('text/plain', 'Test'); var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); expect($tr.hasClass('highlighted')).toEqual(true); expect(fileList._detailsView.getFileInfo().id).toEqual(1); }); it('keeps the last highlighted file when clicking outside', function() { var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); fileList.$el.find('tfoot').click(); @@ -2455,12 +2455,12 @@ describe('OCA.Files.FileList tests', function() { var $tr = fileList.findFileEl('One.txt'); // select - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); $tr.find('input:checkbox').click(); expect($tr.hasClass('highlighted')).toEqual(false); // deselect - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); $tr.find('input:checkbox').click(); expect($tr.hasClass('highlighted')).toEqual(false); @@ -2470,12 +2470,12 @@ describe('OCA.Files.FileList tests', function() { var $tr = fileList.findFileEl('One.txt'); // select - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); fileList.$el.find('.select-all.checkbox').click(); expect($tr.hasClass('highlighted')).toEqual(false); // deselect - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); fileList.$el.find('.select-all.checkbox').click(); expect($tr.hasClass('highlighted')).toEqual(false); @@ -2484,7 +2484,7 @@ describe('OCA.Files.FileList tests', function() { it('closes sidebar whenever the currently highlighted file was removed from the list', function() { jQuery.fx.off = true; var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); expect($tr.hasClass('highlighted')).toEqual(true); expect(fileList._detailsView.getFileInfo().id).toEqual(1); @@ -2496,7 +2496,7 @@ describe('OCA.Files.FileList tests', function() { }); it('returns the currently selected model instance when calling getModelForFile', function() { var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); var model1 = fileList.getModelForFile('One.txt'); var model2 = fileList.getModelForFile('One.txt'); @@ -2511,7 +2511,7 @@ describe('OCA.Files.FileList tests', function() { it('closes the sidebar when switching folders', function() { jQuery.fx.off = true; var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename>a.name').click(); + $tr.find('td.filesize').click(); expect($('#app-sidebar').hasClass('disappear')).toEqual(false); fileList.changeDirectory('/another'); @@ -2560,7 +2560,7 @@ describe('OCA.Files.FileList tests', function() { // not set. fileList.fileActions.currentFile = null; var $tr = fileList.findFileEl('One.txt'); - $tr.find('td.filename a.name').click(); + $tr.find('td.filesize').click(); expect(detailsActionStub.calledOnce).toEqual(true); expect(detailsActionStub.getCall(0).args[0]).toEqual('One.txt'); var context = detailsActionStub.getCall(0).args[1]; |