diff options
| author | Erik Sargent <esthepiking@gmail.com> | 2012-11-30 10:10:00 -0700 |
|---|---|---|
| committer | Erik Sargent <esthepiking@gmail.com> | 2012-11-30 10:10:00 -0700 |
| commit | 5d13b0533dce98cabd251c929ae50f74436ce68e (patch) | |
| tree | b30e0f42914262b71603ce84fe9cc8639e6eb911 /apps | |
| parent | 21606633099a3f46194733fb4f28fcb2bf0edf5b (diff) | |
| download | nextcloud-server-5d13b0533dce98cabd251c929ae50f74436ce68e.tar.gz nextcloud-server-5d13b0533dce98cabd251c929ae50f74436ce68e.zip | |
event.ctrlKey
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/keyboardshortcuts.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 1d4f068341b..c430ed2d741 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -148,7 +148,8 @@ Files.bindKeyboardShortcuts = function (document, $) { || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 - || $.inArray(keyCodes.ctrl, keys) !== -1) + || $.inArray(keyCodes.ctrl, keys) !== -1 + || event.ctrlKey) && $.inArray(keyCodes.shift, keys) !== -1 ){ $("#fileList tr").each(function(index){//prevent default when renaming file/folder @@ -172,7 +173,9 @@ Files.bindKeyboardShortcuts = function (document, $) { || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 - || $.inArray(keyCodes.ctrl, keys) !== -1)){ + || $.inArray(keyCodes.ctrl, keys) !== -1 + || event.ctrlKey + )){ if($.inArray(keyCodes.shift, keys) !== -1 ){ //16=shift, New File newFile(); @@ -204,7 +207,8 @@ Files.bindKeyboardShortcuts = function (document, $) { || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 - || $.inArray(keyCodes.ctrl, keys) !== -1) + || $.inArray(keyCodes.ctrl, keys) !== -1 + || event.ctrlKey) && $.inArray(keyCodes.shift, keys) !== -1 ){//rename file rename(); |