Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into 'master'

Stop edit note up key shortcut conflicting with native shortcuts ## What does this MR do? Restricts edit note shortcut to only the `up` button, if modifier keys are used it will not fire the shortcut. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18113. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4761

Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into 'master'
fc63251f · Jacob Schatz · 9e56cdb5 · 544ad086 · fc63251f
Commit fc63251f authored Jun 20, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

notes.js.coffee app/assets/javascripts/notes.js.coffee +4 -1

No files found.
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -102,12 +102,15 @@ class @Notes

  keydownNoteText: (e) ->
    $this = $(this)
-    if $this.val() is '' and e.which is 38 #aka the up key
+    if $this.val() is '' and e.which is 38 and not isMetaKey e
      myLastNote = $("li.note[data-author-id='#{gon.current_user_id}'][data-editable]:last")
      if myLastNote.length
        myLastNoteEditBtn = myLastNote.find('.js-note-edit')
        myLastNoteEditBtn.trigger('click', [true, myLastNote])

+  isMetaKey = (e) ->
+    (e.metaKey or e.ctrlKey or e.altKey or e.shiftKey)
+
  initRefresh: ->
    clearInterval(Notes.interval)
    Notes.interval = setInterval =>