Merge branch 'ctr-enter-textarea-mac' into 'master'

ctrl+enter on mac correctly submits forms Closes #4177 See merge request !3089

Merge branch 'ctr-enter-textarea-mac' into 'master'
ec68d673 · Jacob Schatz · cb73470b · 692773c5 · ec68d673
Commit ec68d673 authored Mar 04, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

quick_submit.js.coffee app/assets/javascripts/behaviors/quick_submit.js.coffee +1 -4

No files found.
--- a/app/assets/javascripts/behaviors/quick_submit.js.coffee
+++ b/app/assets/javascripts/behaviors/quick_submit.js.coffee
@@ -24,10 +24,7 @@ keyCodeIs = (e, keyCode) ->
 $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) ->
  return unless keyCodeIs(e, 13) # Enter

-  if isMac()
-    return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey)
-  else
-    return unless (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
+  return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)

  e.preventDefault()