Skip to content

Commit b3af10f

Browse files
authored
JI-6488 handle av file upload error (#275)
* JI-6488 handle av file upload error * JI-6488 fix error selection * JI-6488 select boxEl from many
1 parent d4bdde8 commit b3af10f

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

scripts/h5peditor-av.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
4343
self.replaceCallback();
4444
});
4545

46-
4746
self.on('upload', function () {
4847
// Insert throbber
4948
self.$uploading = $('<div class="h5peditor-uploading h5p-throbber">' + H5PEditor.t('core', 'uploading') + '</div>').insertAfter(self.$add.hide());
@@ -67,7 +66,8 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
6766
const updateId = event.data?.updateId ?? undefined;
6867
this.updateId = updateId;
6968
const boxesEl = Array.from(self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__videobox-wrapper:not(.h5p-dnd__videobox-wrapper--is-provider)'));
70-
let boxEl;
69+
const boxEls = self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__box');
70+
let boxEl = boxEls[boxEls.length - 1];
7171

7272
try {
7373
if (result.error) {
@@ -124,7 +124,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
124124
errorEls.forEach(errorEl => errorEl.classList.remove('has-error'));
125125
}
126126
catch (error) {
127-
self.setErrorMessage(result.error, boxEl);
127+
self.setErrorMessage(error.message || error, boxEl);
128128
}
129129

130130
if (self.$uploading !== undefined && self.$uploading.length !== 0) {
@@ -1022,6 +1022,12 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
10221022
<div class="h5p-loader__icon"></div>
10231023
</div>
10241024
</div>
1025+
<div class="h5p-dnd__row">
1026+
<div id="errorContainer" class="video-url-error-container hidden">
1027+
<div class="h5p-errors"></div>
1028+
</div>
1029+
</div>
1030+
<div class="h5p-sr-only" aria-live="polite"></div>
10251031
</div>
10261032
</div>
10271033
`;
@@ -1049,6 +1055,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
10491055
</div>
10501056
</div>
10511057
`: ''}
1058+
<div class="h5p-sr-only" aria-live="polite"></div>
10521059
</div>
10531060
</div>
10541061
`;

0 commit comments

Comments
 (0)