aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-11-27 13:35:12 -0800
committerCesar G <prototech91@gmail.com>2014-01-17 19:20:36 -0800
commit6837b724a39492154b05dfa993a9eac35d7879e7 (patch)
tree9f8028db9318d9761d34a23ce83ad9f305878a2c /phpBB/assets
parent1272c9272e37c3418e2e70a3eb3fdfc6462eb353 (diff)
downloadforums-6837b724a39492154b05dfa993a9eac35d7879e7.tar
forums-6837b724a39492154b05dfa993a9eac35d7879e7.tar.gz
forums-6837b724a39492154b05dfa993a9eac35d7879e7.tar.bz2
forums-6837b724a39492154b05dfa993a9eac35d7879e7.tar.xz
forums-6837b724a39492154b05dfa993a9eac35d7879e7.zip
[ticket/11915] Do not allow more files to be added if queue is already running
PHPBB3-11915
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/plupload.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 9c0526eb9f..594b88bae5 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -588,6 +588,9 @@ uploader.bind('FilesAdded', function(up, files) {
$('#file-total-progress-bar').css('width', up.total.percent + '%');
});
+ // Do not allow more files to be added to the running queue.
+ phpbb.plupload.disableUploader();
+
// Start uploading the files once the user has selected them.
up.start();
});
@@ -659,6 +662,9 @@ uploader.bind('UploadComplete', function(up, files) {
$(this).css('width', 0).show();
});
}, 2000);
+
+ // Re-enable the uploader
+ phpbb.plupload.enableUploader();
});
})(jQuery); // Avoid conflicts with other libraries