diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-04 23:07:02 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-04 23:07:02 -0700 |
| commit | 49c875413ca2fd1cc438ce42c64e0a00a5044e56 (patch) | |
| tree | 933fe162b8d86107db7c8fc002e066d8904d0b89 /phpBB/assets/javascript/plupload.js | |
| parent | e67a19a940291887cfc940175b3485646c37cd95 (diff) | |
| parent | 082a6b29a96ad57ec53e72c9c2b57d919d457d49 (diff) | |
| download | forums-49c875413ca2fd1cc438ce42c64e0a00a5044e56.tar forums-49c875413ca2fd1cc438ce42c64e0a00a5044e56.tar.gz forums-49c875413ca2fd1cc438ce42c64e0a00a5044e56.tar.bz2 forums-49c875413ca2fd1cc438ce42c64e0a00a5044e56.tar.xz forums-49c875413ca2fd1cc438ce42c64e0a00a5044e56.zip | |
Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus
* PayBas/ticket/12541:
[ticket/12541] Activate attachments tab when files are dropped into textarea
Conflicts:
phpBB/styles/prosilver/template/forum_fn.js
Diffstat (limited to 'phpBB/assets/javascript/plupload.js')
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index 8ffd452a09..5445e83e15 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -586,6 +586,11 @@ uploader.bind('FilesAdded', function(up, files) { return; } + // Switch the active tab if the style supports it + if (typeof activateSubPanel == 'function') { + activateSubPanel('attach-panel'); + } + // Show the file list if there aren't any files currently. if (!$('#file-list-container').is(':visible')) { $('#file-list-container').show(100); |