attempt at merge

1 files changed, 2 insertions, 2 deletions

diff --git a/public/assets/js/lib/views/details/editcomment.js b/public/assets/js/lib/views/details/editcomment.js
index ff0190a..1db96a5 100644
--- a/public/assets/js/lib/views/details/editcomment.js
+++ b/public/assets/js/lib/views/details/editcomment.js
@@ -31,7 +31,7 @@ var EditCommentForm = FormView.extend({
   },
 
   keydown: function(e){
-    if ((e.ctrlKey || e.metaKey || e.altKey) && e.keyCode == 83) { // "s" key
+    if (((e.ctrlKey || e.metaKey || e.altKey) && e.keyCode == 83) || (e.ctrlKey && e.keyCode == 13)) { // "s" key or "ctrl + enter" 
       e.preventDefault()
       e.stopPropagation()
       this.save()
@@ -50,4 +50,4 @@ var EditCommentForm = FormView.extend({
   success: function(data){
     window.location.href = "/details/" + data.comment.thread
   }
-})
\ No newline at end of file
+})