Skip to content

Commit 8a0dbf4

Browse files
committed
Add support for dropdowns with no caret.
1 parent eb38b19 commit 8a0dbf4

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.5.11")]
19-
[assembly: AssemblyFileVersion("1.5.11")]
18+
[assembly: AssemblyVersion("1.5.12")]
19+
[assembly: AssemblyFileVersion("1.5.12")]
2020
//[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/GriddlyButton.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public GriddlyButton(string additionalClassName = null)
2222
public bool Enabled { get; set; }
2323
public bool EnableOnSelection { get; set; }
2424
public bool IsSeparator { get; set; }
25-
public bool IsSplitDropdown { get; set; }
25+
public GriddlyDropdownCaret DropdownCaret { get; set; }
2626

2727
/// <summary>
2828
/// Clear the current row selections after this button is activated (default: null). If null, will be determined during render -- true for ajax buttons and false otherwise.
@@ -90,4 +90,11 @@ public enum GriddlyButtonAction
9090
Modal,
9191
PostCriteria
9292
}
93+
94+
public enum GriddlyDropdownCaret
95+
{
96+
Inline = 0,
97+
Split,
98+
None
99+
}
93100
}

Griddly/Views/Shared/Griddly/BootstrapButton.cshtml

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else
2828
{
2929
<div class="btn-group">
3030
@RenderLink(Model, true, false)
31-
@if (Model.IsSplitDropdown)
31+
@if (Model.DropdownCaret == GriddlyDropdownCaret.Split)
3232
{
3333
<button type="button" class="btn btn-default dropdown-toggle @GriddlySettings.DefaultButtonClassName" data-toggle="dropdown">
3434
<span class="caret"></span>
@@ -57,11 +57,11 @@ else
5757
@helper RenderLink(GriddlyButton button, bool isDropdown, bool isMenuItem)
5858
{
5959
string href = null;
60-
if (button.Action != GriddlyButtonAction.Modal && (button.Action != GriddlyButtonAction.Navigate || (isDropdown && !button.IsSplitDropdown)))
60+
if (button.Action != GriddlyButtonAction.Modal && (button.Action != GriddlyButtonAction.Navigate || (isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split)))
6161
{
6262
href = "javascript:void(0)";
6363
}
64-
else if ((button.Action == GriddlyButtonAction.Navigate && (!isDropdown || button.IsSplitDropdown)) || (button.Action == GriddlyButtonAction.Modal && !string.IsNullOrWhiteSpace(button.Target)))
64+
else if ((button.Action == GriddlyButtonAction.Navigate && (!isDropdown || button.DropdownCaret == GriddlyDropdownCaret.Split)) || (button.Action == GriddlyButtonAction.Modal && !string.IsNullOrWhiteSpace(button.Target)))
6565
{
6666
href = button.Argument;
6767
}
@@ -72,13 +72,13 @@ else
7272

7373
bool clearSelectionOnAction = button.ClearSelectionOnAction ?? (button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk);
7474

75-
<a data-role="griddly-button" class="@(!isMenuItem ? "btn btn-default" : null) @(isDropdown && !button.IsSplitDropdown ? "dropdown-toggle" : null) @(!button.Enabled || button.EnableOnSelection == true ? "disabled" : null) @button.ClassName @(!string.IsNullOrWhiteSpace(button.Icon) ? "btn-with-icon" : null)"
75+
<a data-role="griddly-button" class="@(!isMenuItem ? "btn btn-default" : null) @(isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split ? "dropdown-toggle" : null) @(!button.Enabled || button.EnableOnSelection == true ? "disabled" : null) @button.ClassName @(!string.IsNullOrWhiteSpace(button.Icon) ? "btn-with-icon" : null)"
7676
@*onclick="@(button.Action == GriddlyButtonAction.Javascript ? button.Argument : null)"*@
7777
title="@button.Title"
7878
@Html.AttributeIf("target", button.Action == GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
7979
@Html.AttributeIf("href", href != null, href)
8080
@Html.AttributeIf("data-toggle", button.Action != GriddlyButtonAction.Navigate && button.Action != GriddlyButtonAction.Javascript, button.Action.ToString().ToLower())
81-
@Html.AttributeIf("data-toggle", isDropdown && !button.IsSplitDropdown, "dropdown")
81+
@Html.AttributeIf("data-toggle", isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split, "dropdown")
8282
@Html.AttributeIf("data-onclick", button.Action == GriddlyButtonAction.Javascript && !string.IsNullOrWhiteSpace(button.Argument), button.Argument)
8383
@Html.AttributeIf("data-url", button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk || button.Action == GriddlyButtonAction.Post || button.Action == GriddlyButtonAction.PostCriteria, button.Argument)
8484
@Html.AttributeIf("data-target", button.Action != GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
@@ -102,7 +102,7 @@ else
102102

103103
@button.Text
104104

105-
@if (isDropdown && !button.IsSplitDropdown)
105+
@if (isDropdown && button.DropdownCaret == GriddlyDropdownCaret.Inline)
106106
{
107107
<span class="caret"></span>
108108
}

0 commit comments

Comments
 (0)