aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-03-10 22:09:19 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-03-10 22:09:19 +0100
commit9288a50bcf30beb78a0b38ab39c38208becf6a2c (patch)
treef30a15f4f880cfdc6ee05d4e5947531f42ef6729
parent9bcf8df5d0bf1ca813f4fb860ea3128aa905104a (diff)
parent1f25f710eacae402c5f38f9b063a72bbb5258fe4 (diff)
downloadforums-9288a50bcf30beb78a0b38ab39c38208becf6a2c.tar
forums-9288a50bcf30beb78a0b38ab39c38208becf6a2c.tar.gz
forums-9288a50bcf30beb78a0b38ab39c38208becf6a2c.tar.bz2
forums-9288a50bcf30beb78a0b38ab39c38208becf6a2c.tar.xz
forums-9288a50bcf30beb78a0b38ab39c38208becf6a2c.zip
Merge pull request #4211 from marc1706/ticket/14422
[ticket/14422] Support cmd+enter & ctrl+enter for submitting message
-rw-r--r--phpBB/assets/javascript/editor.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index 298526ab1f..3abf5c84f4 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -358,6 +358,12 @@ function getCaretPosition(txtarea) {
if ($('#attach-panel').length) {
phpbb.showDragNDrop(textarea);
}
+
+ $('textarea').on('keydown', function (e) {
+ if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
+ $(this).closest('form').submit();
+ }
+ });
});
})(jQuery);