diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 22:11:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 22:11:07 +0100 |
| commit | 18fea1b2865e30e0784711965806c1b5331f0fe7 (patch) | |
| tree | 80b36f7ec56a60fc3ab80492a4410c731a986ea7 | |
| parent | ad8363ae577bc8e11a19b1a50e1e982f82b525be (diff) | |
| parent | 9288a50bcf30beb78a0b38ab39c38208becf6a2c (diff) | |
| download | forums-18fea1b2865e30e0784711965806c1b5331f0fe7.tar forums-18fea1b2865e30e0784711965806c1b5331f0fe7.tar.gz forums-18fea1b2865e30e0784711965806c1b5331f0fe7.tar.bz2 forums-18fea1b2865e30e0784711965806c1b5331f0fe7.tar.xz forums-18fea1b2865e30e0784711965806c1b5331f0fe7.zip | |
Merge branch '3.1.x' into 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); |