Skip to content

Commit a498f7f

Browse files
committed
Added additionalClassName to GriddlyButton constructor
1 parent 1e8999f commit a498f7f

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
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.0.47.0")]
19-
[assembly: AssemblyFileVersion("1.0.47.0")]
18+
[assembly: AssemblyVersion("1.0.48.0")]
19+
[assembly: AssemblyFileVersion("1.0.48.0")]

Griddly.Mvc/GriddlyButton.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ public class GriddlyButton
2323

2424
public List<GriddlyButton> Buttons { get; set; }
2525

26-
public GriddlyButton()
26+
public GriddlyButton(string additionalClassName = null)
2727
{
2828
Buttons = new List<GriddlyButton>();
2929

3030
Enabled = true;
3131
Action = GriddlyButtonAction.Navigate;
32-
ClassName = GriddlySettings.DefaultButtonClassName;
32+
33+
ClassName = ((GriddlySettings.DefaultButtonClassName ?? "") + " " + (additionalClassName ?? "")).Trim();
3334
}
3435

3536
public GriddlyButton Add(GriddlyButton item)

Griddly.Mvc/GriddlySettings.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public GriddlySettings Button(Func<object, object> argumentTemplate, string capt
130130
if (enableOnSelection == null)
131131
enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
132132

133-
var button = new GriddlyButton()
133+
var button = new GriddlyButton(className)
134134
{
135135
ArgumentTemplate = argumentTemplate,
136136
Text = caption,
@@ -140,8 +140,6 @@ public GriddlySettings Button(Func<object, object> argumentTemplate, string capt
140140
Target = target
141141
};
142142

143-
button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
144-
145143
return Add(button);
146144
}
147145

@@ -150,7 +148,7 @@ public GriddlySettings Button(string argument, string caption, string icon = nul
150148
if (enableOnSelection == null)
151149
enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
152150

153-
var button = new GriddlyButton()
151+
var button = new GriddlyButton(className)
154152
{
155153
Argument = argument,
156154
Text = caption,
@@ -160,8 +158,6 @@ public GriddlySettings Button(string argument, string caption, string icon = nul
160158
Target = target
161159
};
162160

163-
button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
164-
165161
return Add(button);
166162
}
167163

0 commit comments

Comments
 (0)