diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-09 11:13:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-09 11:13:42 +0000 |
| commit | 356bafcbb4a1702038d1a27ba35203bdcdffd94f (patch) | |
| tree | 28fd0f796a684afaafa17c22a7c7eb0a8075f383 | |
| parent | 9562f028594c6d61834d48f75f8379b0de2ba8ae (diff) | |
| parent | a68eabd212a0ca67b57435e049289f895dee8ac8 (diff) | |
| download | gitlab-ce-356bafcbb4a1702038d1a27ba35203bdcdffd94f.tar.gz | |
Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master'
Make submit hotkey available to all notes forms.
Addresses #2221.
See merge request !1847
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index b9bd5c730bf..21656f59149 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -63,13 +63,11 @@ class @Notes # fetch notes when tab becomes visible $(document).on "visibilitychange", @visibilityChange - @notes_forms = '.js-main-target-form textarea, .js-discussion-note-form textarea' # Chrome doesn't fire keypress or keyup for Command+Enter, so we need keydown. - $(document).on('keydown', @notes_forms, (e) -> + $(document).on 'keydown', '.js-note-text', (e) -> return if e.originalEvent.repeat if e.keyCode == 10 || ((e.metaKey || e.ctrlKey) && e.keyCode == 13) - $(@).parents('form').submit() - ) + $(@).closest('form').submit() cleanBinding: -> $(document).off "ajax:success", ".js-main-target-form" @@ -84,7 +82,7 @@ class @Notes $(document).off "click", ".js-discussion-reply-button" $(document).off "click", ".js-add-diff-note-button" $(document).off "visibilitychange" - $(document).off "keydown", @notes_forms + $(document).off "keydown", ".js-note-text" $(document).off "keyup", ".js-note-text" $(document).off "click", ".js-note-target-reopen" $(document).off "click", ".js-note-target-close" |