diff --git a/app/assets/javascripts/admin/users.js b/app/assets/javascripts/admin/users.js index 1b0df3a..9166e5c 100644 --- a/app/assets/javascripts/admin/users.js +++ b/app/assets/javascripts/admin/users.js @@ -21,8 +21,8 @@ $(document).on('ready page:load', function () { index: 1 }]); - $("textarea").keydown(function(e){ - // Enter was pressed without shift key + $("textarea.shift-enter").keydown(function(e){ + if (e.keyCode == 13 && !e.shiftKey) { if (this.form) @@ -31,6 +31,7 @@ $(document).on('ready page:load', function () { e.preventDefault(); return false; } + }); $('#user_filter_word').textcomplete([ diff --git a/app/views/admin/messages/new.html.erb b/app/views/admin/messages/new.html.erb index 8824f68..bb6555f 100644 --- a/app/views/admin/messages/new.html.erb +++ b/app/views/admin/messages/new.html.erb @@ -4,7 +4,7 @@