aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/plupload.js
diff options
context:
space:
mode:
authoralf007 <alf007@free.fr>2015-05-25 00:14:48 +0200
committeralf007 <alf007@free.fr>2015-05-25 00:14:48 +0200
commit6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b (patch)
treebd40622b18c3ce4d8174f2dc717ae19a12cf3d1a /phpBB/assets/javascript/plupload.js
parent6a4cb42565d7e1663da4d02cd8d624b034b20afe (diff)
parent6322970766bd9fa78327fa2ca6a6a43d73b680ee (diff)
downloadforums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar
forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.gz
forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.bz2
forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.xz
forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.zip
Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
Diffstat (limited to 'phpBB/assets/javascript/plupload.js')
-rw-r--r--phpBB/assets/javascript/plupload.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 5445e83e15..a58c71e64d 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -34,6 +34,14 @@ phpbb.plupload.initialize = function() {
if (uploader.features.dragdrop) {
$('#drag-n-drop-message').show();
}
+
+ // Ensure "Add files" button position is correctly calculated.
+ if ($('#attach-panel-multi').is(':visible')) {
+ uploader.refresh();
+ }
+ $('[data-subpanel="attach-panel"]').one('click', function() {
+ uploader.refresh();
+ });
});
};