diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/js/keyboardshortcuts.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9f0bafafbdf..96dd0323d29 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -288,7 +288,7 @@ var FileList={ }, finishDelete:function(ready,sync){ if(!FileList.deleteCanceled && FileList.deleteFiles){ - var fileNames=FileList.deleteFiles.join(';'); + var fileNames=JSON.stringify(FileList.deleteFiles); $.ajax({ url: OC.filePath('files', 'ajax', 'delete.php'), async:!sync, diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 562755f55b7..cc2b5d42139 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -127,6 +127,9 @@ var Files = Files || {}; } Files.bindKeyboardShortcuts = function(document, $) { $(document).keydown(function(event) { //check for modifier keys + if(!$(event.target).is('body')) { + return; + } var preventDefault = false; if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode); if ( |