Merge branch 'issue-7881-stickyheader-with-dialog-actions' into develop

Author: exileDev

src/Plugins/Nop.Plugin.Misc.RFQ/Views/Admin/AdminQuotes.cshtml

@@ -26,7 +26,7 @@
                 <i class="fas fa-plus-square"></i>
                 @T("Plugins.Misc.RFQ.CreateNew")
             </button>
-            <button type="button" id="delete-selected" name="delete-selected" class="btn btn-danger">
+            <button type="button" id="delete-selected" class="btn btn-danger">
                 <i class="far fa-trash-alt"></i>
                 @T("Plugins.Misc.RFQ.DeleteSelected")
             </button>

src/Plugins/Nop.Plugin.Misc.RFQ/Views/Admin/AdminRequests.cshtml

@@ -21,7 +21,7 @@
             @T("Plugins.Misc.RFQ.RequestsQuote")
         </h1>
         <div class="float-right">
-            <button type="button" id="delete-selected" name="delete-selected" class="btn btn-danger">
+            <button type="button" id="delete-selected" class="btn btn-danger">
                 <i class="far fa-trash-alt"></i>
                 @T("Plugins.Misc.RFQ.DeleteSelected")
             </button>

src/Presentation/Nop.Web.Framework/Models/ActionConfirmationModel.cs

@@ -19,6 +19,10 @@ public partial class ActionConfirmationModel
     /// </summary>
     public string WindowId { get; set; }
     /// <summary>
+    /// Button ID
+    /// </summary>
+    public string ButtonId { get; set; }
+    /// <summary>
     /// Additionl confirm text
     /// </summary>
     public string AdditonalConfirmText { get; set; }

src/Presentation/Nop.Web.Framework/TagHelpers/Admin/NopActionConfirmationTagHelper.cs

@@ -64,6 +64,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             ControllerName = _htmlHelper.ViewContext.RouteData.Values["controller"].ToString(),
             ActionName = Action,
             WindowId = modalId,
+            ButtonId = ButtonId,
             AdditonalConfirmText = ConfirmText
         };
 
@@ -79,18 +80,6 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
 
         var partialView = await _htmlHelper.PartialAsync("Confirm", actionConfirmationModel);
         output.Content.SetHtmlContent(partialView);
-
-        //modal script
-        var script = new TagBuilder("script");
-        script.InnerHtml.AppendHtml(
-            "$(function() {" +
-            $"$('#{ButtonId}').attr(\"data-toggle\", \"modal\").attr(\"data-target\", \"#{modalId}\");" +
-            $"$('#{modalId}-submit-button').attr(\"name\", $(\"#{ButtonId}\").attr(\"name\"));" +
-            $"$(\"#{ButtonId}\").attr(\"name\", \"\");" +
-            $"if($(\"#{ButtonId}\").attr(\"type\") == \"submit\")$(\"#{ButtonId}\").attr(\"type\", \"button\");" +
-            "});");
-        var scriptTag = await script.RenderHtmlContentAsync();
-        output.PostContent.SetHtmlContent(scriptTag);
     }
 
     #endregion

src/Presentation/Nop.Web/Areas/Admin/Views/Log/List.cshtml

@@ -18,7 +18,7 @@
             @T("Admin.System.Log")
         </h1>
         <div class="float-right">
-            <button type="button" id="delete-selected" name="delete-selected" class="btn btn-danger">
+            <button type="button" id="delete-selected" class="btn btn-danger">
                 <i class="far fa-trash-can"></i>
                 @T("Admin.System.Log.DeleteSelected")
             </button>

src/Presentation/Nop.Web/Areas/Admin/Views/Order/AddShipment.cshtml

@@ -111,17 +111,13 @@
                                         $("#shipment-save-action-confirmation").remove();
                                         $(this).attr("name", "save").attr("type", "submit");
                                     }
-                                }).on("click", function () {
-                                    return validateWarehouseAvailability("save");
                                 });
 
                                 $("#shipment-save-continue").on("focus", function () {
                                     if (validateWarehouseAvailability("continue")) {
                                         $("#shipment-save-continue-action-confirmation").remove();
                                         $(this).attr("name", "save-continue").attr("type", "submit");
                                     }
-                                }).on("click", function () {
-                                    return validateWarehouseAvailability("continue");
                                 });
                             });
 

src/Presentation/Nop.Web/Areas/Admin/Views/Product/BulkEdit.cshtml

@@ -24,7 +24,7 @@
                 </small>
             </h1>
             <div class="float-right">
-                <button type="submit" id="bulk-edit-save-selected" name="bulk-edit-save-selected" class="btn btn-primary">
+                <button type="submit" id="bulk-edit-save-selected" class="btn btn-primary">
                     <i class="far fa-save"></i>
                     @T("Admin.Catalog.Products.BulkEdit.SaveSelected")
                 </button>

src/Presentation/Nop.Web/Areas/Admin/Views/QueuedEmail/List.cshtml

@@ -249,7 +249,7 @@
                                 });
 
                                 //"requeue selected" button
-                                $("#requeue-selected-action-confirmation").on("click", function () {
+                                $("#requeue-selected-action-confirmation-submit-button").on("click", function () {
                                     var postData = {
                                         selectedIds: selectedIds
                                     };

src/Presentation/Nop.Web/Areas/Admin/Views/Shared/Confirm.cshtml

@@ -16,10 +16,28 @@
             @T("Admin.Common.ActionConfirmation")
         </div>
         <div class="modal-footer">
-            <button type="submit" id="@(Model.WindowId)-submit-button" class="btn btn-primary float-right">
+            <button type="button" id="@(Model.WindowId)-submit-button" class="btn btn-primary float-right">
                 @T("Admin.Common.Yes")
             </button>
             <span class="btn btn-default float-right margin-r-5" data-dismiss="modal">@T("Admin.Common.NoCancel")</span>
         </div>
     </div>
-</div> 
+</div>
+
+<script>
+    $(function(){
+        const openerBtn = document.getElementById('@Model.ButtonId');
+
+        openerBtn.type = "button";
+        openerBtn.setAttribute("data-toggle", "modal");
+        openerBtn.setAttribute("data-target", "#@Model.WindowId")
+
+        $('#@(Model.WindowId)-submit-button').on('click', function() {
+            if (!openerBtn.name)
+                return;
+
+            openerBtn.type = "submit";
+            openerBtn.click();
+        });
+    });
+</script>