Skip to content

Commit f5fb27f

Browse files
ithielnorithielnor
committed
Use the correct data attribute for bs5
1 parent c296bf9 commit f5fb27f

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

‎Griddly.Mvc/GriddlyCss.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ public bool Is(params CssFramework[] inFrameworks)
8080
}
8181
};
8282

83-
84-
8583
public static GriddlyCss Bootstrap5Defaults = new GriddlyCss()
8684
{
8785
Framework = CssFramework.Bootstrap5,

‎Griddly.NetCore.Razor/Pages/Shared/Griddly/BootstrapButton.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
@Html.AttributeIf("target", button.Action == GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
5050
href="@(href ?? "javscript:void()")"
5151
@Html.AttributeIf("data-toggle", button.Action != GriddlyButtonAction.Navigate && button.Action != GriddlyButtonAction.Javascript, button.Action.ToString().ToLower())
52-
@Html.AttributeIf("data-toggle", item.isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split, "dropdown")
52+
@Html.AttributeIf(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "data-toggle" : "data-bs-toggle", item.isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split, "dropdown")
5353
@Html.AttributeIf("data-onclick", button.Action == GriddlyButtonAction.Javascript && !string.IsNullOrWhiteSpace(button.Argument), button.Argument)
5454
@Html.AttributeIf("data-url", button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk || button.Action == GriddlyButtonAction.Post || button.Action == GriddlyButtonAction.PostCriteria, button.Argument)
5555
@Html.AttributeIf("data-target", button.Action != GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
@@ -149,7 +149,7 @@ else
149149
@RenderLink((Model, true, false))
150150
@if (Model.DropdownCaret == GriddlyDropdownCaret.Split)
151151
{
152-
<button type="button" class="dropdown-toggle dropdown-toggle-split @css.ButtonDefault" data-toggle="dropdown" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)">
152+
<button type="button" class="dropdown-toggle dropdown-toggle-split @css.ButtonDefault" data-toggle="@(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "dropdown" : null)" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)">
153153
@if (css.Is(CssFramework.Bootstrap3))
154154
{
155155
<span class="@css.Icons.CaretDown"></span>

‎Griddly.NetCore.Razor/Pages/Shared/Griddly/GriddlyFilters.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ else
4646
<div class="modal-footer" style="@(css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5) ? "justify-content:flex-start" : null@*fix for IE flex bug*@)">
4747

4848
<div class="btn-group @(css.Is(CssFramework.Bootstrap5) ? "me-auto" : css.Is(CssFramework.Bootstrap4) ? "mr-auto" : "pull-left")">
49-
<button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="dropdown" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)" aria-haspopup="true" aria-expanded="false">
49+
<button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="@(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "dropdown" : null)" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)" aria-haspopup="true" aria-expanded="false">
5050
Reset @if (css.Is(CssFramework.Bootstrap3)) {<span class="@css.Icons.CaretDown"></span>}
5151
</button>
5252
@if (css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5))

‎Griddly.NetCore.Razor/wwwroot/js/griddly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@
903903
var url = $.trim(clickTarget.parents("tr").data("griddly-url"));
904904
var target = $.trim(clickTarget.parents("tr").data("griddly-urltarget"));
905905

906-
if (url && clickTarget.closest("a").length == 0 && clickTarget.closest("td").find("[data-toggle=dropdown]").length == 0)
906+
if (url && clickTarget.closest("a").length == 0 && clickTarget.closest("td").find("[data-toggle=dropdown],[data-bs-toggle=dropdown]").length == 0)
907907
{
908908
e.preventDefault();
909909

‎Griddly/Scripts/griddly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@
903903
var url = $.trim(clickTarget.parents("tr").data("griddly-url"));
904904
var target = $.trim(clickTarget.parents("tr").data("griddly-urltarget"));
905905

906-
if (url && clickTarget.closest("a").length == 0 && clickTarget.closest("td").find("[data-toggle=dropdown]").length == 0)
906+
if (url && clickTarget.closest("a").length == 0 && clickTarget.closest("td").find("[data-toggle=dropdown],[data-bs-toggle=dropdown]").length == 0)
907907
{
908908
e.preventDefault();
909909

‎Griddly/Views/Shared/Griddly/BootstrapButton.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ else
3030
@RenderLink(Model, true, false)
3131
@if (Model.DropdownCaret == GriddlyDropdownCaret.Split)
3232
{
33-
<button type="button" class="dropdown-toggle dropdown-toggle-split @css.ButtonDefault" data-toggle="dropdown" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)">
33+
<button type="button" class="dropdown-toggle dropdown-toggle-split @css.ButtonDefault" data-toggle="@(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "dropdown" : null)" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)">
3434
@if (css.Is(CssFramework.Bootstrap3))
3535
{
3636
<span class="@css.Icons.CaretDown"></span>
@@ -94,7 +94,7 @@ else
9494
@Html.AttributeIf("target", button.Action == GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
9595
href="@(href ?? "javscript:void()")"
9696
@Html.AttributeIf("data-toggle", button.Action != GriddlyButtonAction.Navigate && button.Action != GriddlyButtonAction.Javascript, button.Action.ToString().ToLower())
97-
@Html.AttributeIf("data-toggle", isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split, "dropdown")
97+
@Html.AttributeIf(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "data-toggle" : "data-bs-toggle", isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split, "dropdown")
9898
@Html.AttributeIf("data-onclick", button.Action == GriddlyButtonAction.Javascript && !string.IsNullOrWhiteSpace(button.Argument), button.Argument)
9999
@Html.AttributeIf("data-url", button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk || button.Action == GriddlyButtonAction.Post || button.Action == GriddlyButtonAction.PostCriteria, button.Argument)
100100
@Html.AttributeIf("data-target", button.Action != GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)

‎Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ else
5656
else
5757
{
5858
<div class="griddly-reset-btn btn-group @(css.Is(CssFramework.Bootstrap5) ? "me-auto" : css.Is(CssFramework.Bootstrap4) ? "mr-auto" : "pull-left")">
59-
<button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="dropdown" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)" aria-haspopup="true" aria-expanded="false">
59+
<button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="@(css.Is(CssFramework.Bootstrap3, CssFramework.Bootstrap4) ? "dropdown" : null)" data-bs-toggle="@(css.Is(CssFramework.Bootstrap5) ? "dropdown" : null)" aria-haspopup="true" aria-expanded="false">
6060
Reset @if (css.Is(CssFramework.Bootstrap3)) {<span class="@css.Icons.CaretDown"></span>}
6161
</button>
6262
@if (css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5))

0 commit comments

Comments
 (0)