diff options
| author | javiexin <javiexin@gmail.com> | 2015-07-09 20:02:39 +0200 |
|---|---|---|
| committer | javiexin <javiexin@gmail.com> | 2015-07-09 20:02:39 +0200 |
| commit | 054da801144c5e6f70a3c7fcd8244c38e2a1c619 (patch) | |
| tree | dbbdb2dcb9cea44e67a5d0122946167786c557fe /phpBB/assets/javascript/editor.js | |
| parent | 558d604d83fd5ded2edc854a9944ad0d1188e2e5 (diff) | |
| parent | f576f42b4d3c607aee6b30154502adfed79301fb (diff) | |
| download | forums-054da801144c5e6f70a3c7fcd8244c38e2a1c619.tar forums-054da801144c5e6f70a3c7fcd8244c38e2a1c619.tar.gz forums-054da801144c5e6f70a3c7fcd8244c38e2a1c619.tar.bz2 forums-054da801144c5e6f70a3c7fcd8244c38e2a1c619.tar.xz forums-054da801144c5e6f70a3c7fcd8244c38e2a1c619.zip | |
Merge pull request #1 from phpbb/3.1.x
Bring version up to date 20150708
Diffstat (limited to 'phpBB/assets/javascript/editor.js')
| -rw-r--r-- | phpBB/assets/javascript/editor.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 5fd4f7eae3..298526ab1f 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -159,7 +159,7 @@ function insert_text(text, spaces, popup) { /** * Add inline attachment at position */ -function attach_inline(index, filename) { +function attachInline(index, filename) { insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); document.forms[form_name].elements[text_name].focus(); } @@ -355,6 +355,9 @@ function getCaretPosition(txtarea) { textarea = doc.forms[form_name].elements[text_name]; phpbb.applyCodeEditor(textarea); + if ($('#attach-panel').length) { + phpbb.showDragNDrop(textarea); + } }); })(jQuery); |