mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disallow ctrl click to select when selection not allowed

This commit is contained in:
Vincent Petry 2015-01-15 18:16:27 +01:00
parent d40301492d
commit 7f24e77cfc
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/filelist.js
View File

@ -323,7 +323,7 @@
*/ */
_onClickFile: function(event) { _onClickFile: function(event) {
var $tr = $(event.target).closest('tr'); var $tr = $(event.target).closest('tr');
if (event.ctrlKey || event.shiftKey) { if (this._allowSelection && (event.ctrlKey || event.shiftKey)) {
event.preventDefault(); event.preventDefault();
if (event.shiftKey) { if (event.shiftKey) {
var $lastTr = $(this._lastChecked); var $lastTr = $(this._lastChecked);

30
apps/files/tests/js/filelistSpec.js
View File

@ -1790,6 +1790,36 @@ describe('OCA.Files.FileList tests', function() {
expect(fileList.$el.find('.select-all').prop('checked')).toEqual(false); expect(fileList.$el.find('.select-all').prop('checked')).toEqual(false);
expect(fileList.getSelectedFiles()).toEqual([]); expect(fileList.getSelectedFiles()).toEqual([]);
}); });
describe('Disabled selection', function() {
beforeEach(function() {
fileList._allowSelection = false;
fileList.setFiles(testFiles);
});
it('Does not render checkboxes', function() {
expect(fileList.$fileList.find('.selectCheckBox').length).toEqual(0);
});
it('Does not select a file with Ctrl or Shift if selection is not allowed', function() {
var $tr = fileList.findFileEl('One.txt');
var $tr2 = fileList.findFileEl('Three.pdf');
var e;
e = new $.Event('click');
e.ctrlKey = true;
$tr.find('td.filename .name').trigger(e);
// click on second entry, does not clear the selection
e = new $.Event('click');
e.ctrlKey = true;
$tr2.find('td.filename .name').trigger(e);
expect(fileList.getSelectedFiles().length).toEqual(0);
// deselect now
e = new $.Event('click');
e.shiftKey = true;
$tr2.find('td.filename .name').trigger(e);
expect(fileList.getSelectedFiles().length).toEqual(0);
});
})
}); });
describe('File actions', function() { describe('File actions', function() {
it('Clicking on a file name will trigger default action', function() { it('Clicking on a file name will trigger default action', function() {