Skip to content

Commit

Permalink
[BUGFIX] Fix table markup in DragDropUploader
Browse files Browse the repository at this point in the history
Resolves: #83938
Releases: master, 8.7
Change-Id: I71ddeb358cea2b24a4db46545a35ca956c6bc320
Reviewed-on: https://review.typo3.org/55756
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
  • Loading branch information
Mathias Schreiber authored and andreaskienast committed Feb 16, 2018
1 parent 57d0ae7 commit d33c9f1
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
Expand Up @@ -258,7 +258,10 @@ define(['jquery',

// no filelist then create own progress table
if (me.$fileList.length === 0) {
me.$fileList = $('<table />').attr('id', 'typo3-filelist').addClass('table table-striped table-hover upload-queue').html('<tbody></tbody>').hide();
me.$fileList = $('<table />')
.attr('id', 'typo3-filelist')
.addClass('table table-striped table-hover upload-queue')
.html('<tbody></tbody>').hide();
if (me.dropZoneInsertBefore) {
me.$fileList.insertAfter(me.$dropzone);
} else {
Expand Down Expand Up @@ -304,12 +307,14 @@ define(['jquery',
}
var $modalContent = $('<div/>').append(
$('<p/>').text(TYPO3.lang['file_upload.existingfiles.description']),
$('<table/>').append(
$('<tr />').append(
$('<th/>'),
$('<th/>').text(TYPO3.lang['file_upload.header.originalFile']),
$('<th/>').text(TYPO3.lang['file_upload.header.uploadedFile']),
$('<th/>').text(TYPO3.lang['file_upload.header.action'])
$('<table/>', {class: 'table'}).append(
$('<thead/>').append(
$('<tr />').append(
$('<th/>'),
$('<th/>').text(TYPO3.lang['file_upload.header.originalFile']),
$('<th/>').text(TYPO3.lang['file_upload.header.uploadedFile']),
$('<th/>').text(TYPO3.lang['file_upload.header.action'])
)
)
)
);
Expand Down Expand Up @@ -339,7 +344,7 @@ define(['jquery',
)
)
);
$modalContent.find('table').append($record);
$modalContent.find('table').append('<tbody />').append($record);
}

var $modal = Modal.confirm(TYPO3.lang['file_upload.existingfiles.title'], $modalContent, Severity.warning, [
Expand Down

0 comments on commit d33c9f1

Please sign in to comment.