From 7ac1cb68f699e1a1d9a6bd4f2f59a7068d39e4b2 Mon Sep 17 00:00:00 2001
From: Vincent Chan <plus.vincchan@gmail.com>
Date: Mon, 2 May 2016 19:52:13 +0200
Subject: [PATCH 1/3] Submit comment on ctrl+Enter closes #24302

---
 apps/comments/js/commentstabview.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 415ec2a9be..2d6671557f 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -301,6 +301,11 @@
 			var limitExceeded = (len > this._commentMaxLength);
 			$field.toggleClass('error', limitExceeded);
 			$submitButton.prop('disabled', limitExceeded);
+
+			//submits form on ctrlEnter
+			if (ev.keyCode === 13 && ev.ctrlKey) {
+				$submitButton.click();
+		  }
 		},
 
 		_onClickComment: function(ev) {

From bc0d136511efdef4cb15abd1963e4834c97caf89 Mon Sep 17 00:00:00 2001
From: Vincent Chan <plus.vincchan@gmail.com>
Date: Tue, 3 May 2016 12:22:46 +0200
Subject: [PATCH 2/3] adds functionality to submit comments with cmd+Enter

---
 apps/comments/js/commentstabview.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 2d6671557f..7cda071d31 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -172,7 +172,7 @@
 				this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 28);
 			}
 			this.delegateEvents();
-			this.$el.find('textarea').on('keyup input change', this._onTypeComment);
+			this.$el.find('textarea').on('keydown input change', this._onTypeComment);
 		},
 
 		_formatItem: function(commentModel) {
@@ -273,7 +273,7 @@
 			// spawn form
 			$comment.after($formRow);
 			$formRow.data('commentEl', $comment);
-			$formRow.find('textarea').on('keyup input change', this._onTypeComment);
+			$formRow.find('textarea').on('keydown input change', this._onTypeComment);
 
 			// copy avatar element from original to avoid flickering
 			$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
@@ -302,8 +302,8 @@
 			$field.toggleClass('error', limitExceeded);
 			$submitButton.prop('disabled', limitExceeded);
 
-			//submits form on ctrlEnter
-			if (ev.keyCode === 13 && ev.ctrlKey) {
+			//submits form on ctrl+Enter or cmd+Enter
+			if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
 				$submitButton.click();
 		  }
 		},

From 5f2a19e96555e717821dae937beb377408b91527 Mon Sep 17 00:00:00 2001
From: Vincent Chan <plus.vincchan@gmail.com>
Date: Tue, 3 May 2016 12:29:43 +0200
Subject: [PATCH 3/3] fixes indentation

---
 apps/comments/js/commentstabview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 7cda071d31..9475dc53fc 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -305,7 +305,7 @@
 			//submits form on ctrl+Enter or cmd+Enter
 			if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
 				$submitButton.click();
-		  }
+			}
 		},
 
 		_onClickComment: function(ev) {