diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-18 12:28:20 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-18 12:28:20 -0600 |
| commit | 74836f8c64029b21215a32bb9f35cce2833f693f (patch) | |
| tree | d3ae4a0c3d56c24c493b957b73ab01a20e98e5be /phpBB | |
| parent | 69c119485aa992d68a88a03bbbe283db665f7562 (diff) | |
| parent | 1c56d28d9bd26d0a269084326e998c88e810d9f4 (diff) | |
| download | forums-74836f8c64029b21215a32bb9f35cce2833f693f.tar forums-74836f8c64029b21215a32bb9f35cce2833f693f.tar.gz forums-74836f8c64029b21215a32bb9f35cce2833f693f.tar.bz2 forums-74836f8c64029b21215a32bb9f35cce2833f693f.tar.xz forums-74836f8c64029b21215a32bb9f35cce2833f693f.zip | |
Merge pull request #2040 from prototech/ticket/12208
[ticket/12208] Remove file from upload queue if deleted before being uploaded.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index a90757d487..91a9806955 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -230,6 +230,9 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) { phpbb.plupload.deleteFile = function(row, attachId) { // If there's no attach id, then the file hasn't been uploaded. Simply delete the row. if (typeof attachId === 'undefined') { + var file = uploader.getFile(row.attr('id')); + uploader.removeFile(file); + row.slideUp(100, function() { row.remove(); phpbb.plupload.hideEmptyList(); |