Merge branch 'rel-1.7'

Megabit · Feb 20, 2025 · ec68437 · ec68437
2 parents 4ff8484 + 6549e9a
commit ec68437
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Markdown/MarkdownPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Markdown/MarkdownPage.razor
@@ -58,7 +58,9 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Upload image">
-        Uploading image has a similar API to our FileEdit component and it is fairly simple to do.
+        Uploading an image has a similar API to our <Code>FileEdit</Code> component and is fairly simple to use.
+        <Strong>Note that</Strong> the events related to file uploads fire separately for each file instead of grouping them.
+        This behavior comes from the underlying Easy Markdown Editor, which processes files individually.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <MarkdownUploadImageExample />

diff --git a/Source/Extensions/Blazorise.Markdown/wwwroot/markdown.js b/Source/Extensions/Blazorise.Markdown/wwwroot/markdown.js
@@ -80,7 +80,9 @@ export function initialize(dotNetObjectRef, element, elementId, options) {
             imageUploadNotifier.onError = onError;
 
             // Reduce to purely serializable data, plus build an index by ID
-            element._blazorFilesById = {};
+            if (element._blazorFilesById == null) {
+                element._blazorFilesById = {};
+            }
 
             var fileEntry = {
                 id: ++nextFileId,

diff --git a/Source/Extensions/Blazorise.Video/wwwroot/video.js b/Source/Extensions/Blazorise.Video/wwwroot/video.js
@@ -502,7 +502,7 @@ function registerToEvents(dotNetAdapter, player, options) {
         invokeDotNetMethodAsync(dotNetAdapter, "NotifyVolumeChange", event.detail.volume || 0, event.detail.muted || false);
     });
 
-    player.addEventListener('seeking', (event) => {
+    player.addEventListener('media-seeking-request', (event) => {
         invokeDotNetMethodAsync(dotNetAdapter, "NotifySeeking", event.detail || 0);
     });