diff options
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/OC/dialogs.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index eb314625859..e32cb6f936e 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -323,7 +323,7 @@ const Dialogs = { newButton.hide() } newButton.on('focus', function() { - self.$filePicker.ocdialog('setEnterCallback', function() { + self.$filePicker.ocdialog('setEnterCallback', function(event) { event.stopImmediatePropagation() event.preventDefault() newButton.click() @@ -336,7 +336,7 @@ const Dialogs = { OC.registerMenu(newButton, self.$filePicker.find('.menu'), function() { $input.tooltip('hide') $input.focus() - self.$filePicker.ocdialog('setEnterCallback', function() { + self.$filePicker.ocdialog('setEnterCallback', function(event) { event.stopImmediatePropagation() event.preventDefault() self.$filePicker.submit() @@ -351,6 +351,13 @@ const Dialogs = { var $form = self.$filePicker.find('.filenameform') var $input = $form.find('input[type=\'text\']') var $submit = $form.find('input[type=\'submit\']') + $input.on('keydown', function(event) { + if (event.key === 'Enter') { + event.stopImmediatePropagation() + event.preventDefault() + $form.submit() + } + }) $submit.on('click', function(event) { event.stopImmediatePropagation() event.preventDefault() @@ -427,13 +434,6 @@ const Dialogs = { $input.val(newText) } }) - $input.keypress(function(event) { - if (event.keyCode === 13 || event.which === 13) { - event.stopImmediatePropagation() - event.preventDefault() - $form.submit() - } - }) $input.on('input', function(event) { $input.tooltip('hide') }) |