aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/plupload.js
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-12 13:05:04 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-12 13:05:04 +0100
commit1b439ee2b758b2bde4fe0825db42a969cace1316 (patch)
treed34b426610df03cba18b6416cbb98a717050cf43 /phpBB/assets/javascript/plupload.js
parent9b4c28410232716de2e80e4900e67f558775eb0e (diff)
parent09ad1d529ef76358eeb25be38884de61a410d066 (diff)
downloadforums-1b439ee2b758b2bde4fe0825db42a969cace1316.tar
forums-1b439ee2b758b2bde4fe0825db42a969cace1316.tar.gz
forums-1b439ee2b758b2bde4fe0825db42a969cace1316.tar.bz2
forums-1b439ee2b758b2bde4fe0825db42a969cace1316.tar.xz
forums-1b439ee2b758b2bde4fe0825db42a969cace1316.zip
Merge branch 'develop-ascraeus' into develop
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();
+ });
});
};