diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 22:11:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 22:11:14 +0100 |
| commit | 2c28138329f4000662973c3f3cdad5691f1dcaea (patch) | |
| tree | e920a10d23ca72a056177dca3892bc50b1af77ae | |
| parent | 6a90172e1a25df241e55e5522f9c0a829f9fcce4 (diff) | |
| parent | 18fea1b2865e30e0784711965806c1b5331f0fe7 (diff) | |
| download | forums-2c28138329f4000662973c3f3cdad5691f1dcaea.tar forums-2c28138329f4000662973c3f3cdad5691f1dcaea.tar.gz forums-2c28138329f4000662973c3f3cdad5691f1dcaea.tar.bz2 forums-2c28138329f4000662973c3f3cdad5691f1dcaea.tar.xz forums-2c28138329f4000662973c3f3cdad5691f1dcaea.zip | |
Merge branch '3.2.x'
| -rw-r--r-- | phpBB/assets/javascript/editor.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index df353bc29d..332ab42e37 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -414,6 +414,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); |