From 19f61d96bf41984d1f9041690e81a5a4ae59058e Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Tue, 9 Jan 2024 08:06:27 -0800
Subject: [PATCH] Fix Media Field dependency (#15017)

---
 .../Views/Media-HtmlField.Modal.cshtml                      | 2 +-
 .../OrchardCore.Html/Views/Media-HtmlBodyPart.Modal.cshtml  | 2 +-
 .../Views/Media-MarkdownBodyPart.Modal.cshtml               | 2 +-
 .../OrchardCore.Media/Views/Admin/Index.cshtml              | 4 +++-
 .../OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml | 2 +-
 .../OrchardCore.Media/Views/MediaField.Edit.cshtml          | 6 ++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/Media-HtmlField.Modal.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/Media-HtmlField.Modal.cshtml
index e88c9ab7159..cb75bffb509 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/Media-HtmlField.Modal.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/Media-HtmlField.Modal.cshtml
@@ -18,6 +18,6 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<script at="Foot">
+<script at="Foot" asp-name="MediaFieldAppInitializer" depends-on="media">
     initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media" })', '@Context.Request.PathBase.ToString()');
 </script>
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/Media-HtmlBodyPart.Modal.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/Media-HtmlBodyPart.Modal.cshtml
index 418900c946d..1407e34d703 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/Media-HtmlBodyPart.Modal.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/Media-HtmlBodyPart.Modal.cshtml
@@ -18,6 +18,6 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<script at="Foot">
+<script at="Foot" asp-name="MediaFieldAppInitializer" depends-on="media">
     initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media" })', '@Context.Request.PathBase.ToString()');
 </script>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/Media-MarkdownBodyPart.Modal.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/Media-MarkdownBodyPart.Modal.cshtml
index a35788afe29..1c2759ab48d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/Media-MarkdownBodyPart.Modal.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/Media-MarkdownBodyPart.Modal.cshtml
@@ -20,6 +20,6 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<script at="Foot">
+<script at="Foot" asp-name="MediaFieldAppInitializer" depends-on="media">
     initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media" })', '@Context.Request.PathBase.ToString()');
 </script>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/Admin/Index.cshtml
index c24a371591b..493ba70fbae 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/Admin/Index.cshtml
@@ -1,9 +1,11 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<script at="Foot">
+<script at="Foot" asp-name="MediaFieldAppInitializer" depends-on="media">
     initializeMediaApplication(true, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media" })', '@Context.Request.PathBase.ToString()');
+</script>
 
+<script at="Foot">
     @* mediaApp is absolutely positioned. When a warning is shown we need to move it down to avoid overlapping. *@
     $(function () {
         if (!$('.message').length) { return; };
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
index c1f9ed3183f..d1d90378fb3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
@@ -13,7 +13,6 @@
     var mediaFieldId = Html.IdFor(m => m);
 }
 
-<script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
@@ -65,6 +64,7 @@
     <partial name="Shared/MediaFieldEditLocalization.cshtml" />
 </div>
 
+<script asp-name="media" at="Foot"></script>
 <script at="Foot">
     initializeAttachedMediaField(
         document.getElementById('@mediaFieldId'),
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
index b2f40c29c41..cb2652652bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
@@ -8,7 +8,6 @@
     var settings = Model.PartFieldDefinition.GetSettings<MediaFieldSettings>();
     var modalMediaId = "Modal" + Html.IdFor(m => m);
 }
-<script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
@@ -62,9 +61,12 @@
     <partial name="Shared/MediaFieldEditLocalization.cshtml" />
 </div>
 
-<script at="Foot">
+<script asp-name="media" at="Foot"></script>
+<script at="Foot" asp-name="MediaFieldAppInitializer" depends-on="media">
     initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media", extensions = string.Join(',', Model.AllowedExtensions) })', '@Context.Request.PathBase.ToString()');
+</script>
 
+<script at="Foot">
     initializeMediaField(
         document.getElementById('@Html.IdFor(m => m)'),
         document.getElementById('@Html.IdFor(m => m)-ModalBody'),