From 8acf23091d15212f38fbf343e2097e378a25cbeb Mon Sep 17 00:00:00 2001
From: devland <adevland@gmail.com>
Date: Fri, 20 Sep 2024 14:17:54 +0200
Subject: [PATCH 1/3] JI-6488 handle av file upload error

---
 scripts/h5peditor-av.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/h5peditor-av.js b/scripts/h5peditor-av.js
index dcbd2031..f7972493 100644
--- a/scripts/h5peditor-av.js
+++ b/scripts/h5peditor-av.js
@@ -43,7 +43,6 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
       self.replaceCallback();
     });
 
-
     self.on('upload', function () {
       // Insert throbber
       self.$uploading = $('<div class="h5peditor-uploading h5p-throbber">' + H5PEditor.t('core', 'uploading') + '</div>').insertAfter(self.$add.hide());
@@ -67,7 +66,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
       const updateId = event.data?.updateId ?? undefined;
       this.updateId = updateId;
       const boxesEl = Array.from(self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__videobox-wrapper:not(.h5p-dnd__videobox-wrapper--is-provider)'));
-      let boxEl;
+      let boxEl = self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__box')[0];
       
       try {
         if (result.error) {
@@ -124,7 +123,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
         errorEls.forEach(errorEl => errorEl.classList.remove('has-error'));
       }
       catch (error) {
-        self.setErrorMessage(result.error, boxEl);
+        self.setErrorMessage(error.message, boxEl);
       }
 
       if (self.$uploading !== undefined && self.$uploading.length !== 0) {
@@ -1022,6 +1021,12 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
                   <div class="h5p-loader__icon"></div>
                 </div>
               </div>
+              <div class="h5p-dnd__row">
+                <div id="errorContainer" class="video-url-error-container hidden">
+                  <div class="h5p-errors"></div>
+                </div>
+              </div>
+              <div class="h5p-sr-only" aria-live="polite"></div>
             </div>
           </div>
         `;
@@ -1049,6 +1054,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
                     </div>
                   </div>
                 `: ''}
+                <div class="h5p-sr-only" aria-live="polite"></div>
               </div>
             </div>
           `;

From cd7177715afb305806323cf3aa4f7c9f5f08d994 Mon Sep 17 00:00:00 2001
From: devland <adevland@gmail.com>
Date: Tue, 24 Sep 2024 09:22:37 +0200
Subject: [PATCH 2/3] JI-6488 fix error selection

---
 scripts/h5peditor-av.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/h5peditor-av.js b/scripts/h5peditor-av.js
index f7972493..8931daba 100644
--- a/scripts/h5peditor-av.js
+++ b/scripts/h5peditor-av.js
@@ -123,7 +123,7 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
         errorEls.forEach(errorEl => errorEl.classList.remove('has-error'));
       }
       catch (error) {
-        self.setErrorMessage(error.message, boxEl);
+        self.setErrorMessage(error.message || error, boxEl);
       }
 
       if (self.$uploading !== undefined && self.$uploading.length !== 0) {

From b2de4447d951aa941ac02147081482b1a15cd089 Mon Sep 17 00:00:00 2001
From: devland <adevland@gmail.com>
Date: Tue, 24 Sep 2024 14:40:14 +0200
Subject: [PATCH 3/3] JI-6488 select boxEl from many

---
 scripts/h5peditor-av.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/h5peditor-av.js b/scripts/h5peditor-av.js
index 8931daba..faf8bd80 100644
--- a/scripts/h5peditor-av.js
+++ b/scripts/h5peditor-av.js
@@ -66,7 +66,8 @@ H5PEditor.widgets.video = H5PEditor.widgets.audio = H5PEditor.AV = (function ($)
       const updateId = event.data?.updateId ?? undefined;
       this.updateId = updateId;
       const boxesEl = Array.from(self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__videobox-wrapper:not(.h5p-dnd__videobox-wrapper--is-provider)'));
-      let boxEl = self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__box')[0];
+      const boxEls = self.$dndFiles.get(0).querySelectorAll('.h5p-dnd__box');
+      let boxEl = boxEls[boxEls.length - 1];
       
       try {
         if (result.error) {