diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-09 17:34:03 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-06-17 18:45:48 +0100 |
| commit | 544ad086da7dd27dbb2f6ba750065f63b2e126e0 (patch) | |
| tree | a13561d9eb37d84de63c5cd0355de9df7875a8a5 | |
| parent | 9b7fd74805684c09d8de314d4eee67b470cb57eb (diff) | |
| download | gitlab-ce-lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting.tar.gz | |
restricted note edit shortcut to only up keylbennett/gitlab-ce-18113-edit-note-shortcut-conflicting
Updated CHANGELOG
Removed CHANGELOG entry
Moved conditional to helper method
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index e2d3241437b..17f7e180127 100644 --- 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 => |