diff options
| author | Cesar G <prototech91@gmail.com> | 2015-05-28 13:36:31 +0200 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2015-05-28 13:36:31 +0200 |
| commit | a8ec353a4f3595781523903a615c2148081c7fb4 (patch) | |
| tree | ad284c446f7400a8491fa0951ad42aa8a4bd06cd /phpBB/assets/javascript/editor.js | |
| parent | f6d7ea425f7942fc40dd69a1b161120110e813aa (diff) | |
| parent | f1e11414e8e910b450ec5a0f7d2d488bc27d9f52 (diff) | |
| download | forums-a8ec353a4f3595781523903a615c2148081c7fb4.tar forums-a8ec353a4f3595781523903a615c2148081c7fb4.tar.gz forums-a8ec353a4f3595781523903a615c2148081c7fb4.tar.bz2 forums-a8ec353a4f3595781523903a615c2148081c7fb4.tar.xz forums-a8ec353a4f3595781523903a615c2148081c7fb4.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/12542] Use more specific CSS for drag-n-drop
[ticket/12542] Do not use browser specific css for outline
[ticket/12542] Properly check if textarea is undefined or null
[ticket/12542] Use extended CSS for all browsers
[ticket/12542] Rename javascript method and add doc block
[ticket/12542] Add different outline colors for body & textarea
[ticket/12542] Add initial drag-n-drop animation
Diffstat (limited to 'phpBB/assets/javascript/editor.js')
| -rw-r--r-- | phpBB/assets/javascript/editor.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 5fd4f7eae3..c58e4d19dd 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -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); |