Skip to content

Commit 2a5b2af

Browse files
committed
Corrected GriddlySettings.Button helpers to properly add classname instead of override.
1 parent 9d5b765 commit 2a5b2af

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Griddly.Mvc/GriddlySettings.cs

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

134-
return Add(new GriddlyButton()
134+
var button = new GriddlyButton()
135135
{
136136
ArgumentTemplate = argumentTemplate,
137137
Text = caption,
138138
Icon = icon,
139139
Action = action,
140140
EnableOnSelection = enableOnSelection.Value,
141-
ClassName = className ?? GriddlySettings.DefaultButtonClassName,
142141
Target = target
143-
});
142+
};
143+
144+
button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
145+
146+
return Add(button);
144147
}
145148

146149
public GriddlySettings Button(string argument, string caption, string icon = null, GriddlyButtonAction action = GriddlyButtonAction.Navigate, bool? enableOnSelection = null, string className = null, string target = null)
147150
{
148151
if (enableOnSelection == null)
149152
enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
150153

151-
return Add(new GriddlyButton()
154+
var button = new GriddlyButton()
152155
{
153156
Argument = argument,
154157
Text = caption,
155158
Icon = icon,
156159
Action = action,
157160
EnableOnSelection = enableOnSelection.Value,
158-
ClassName = className ?? GriddlySettings.DefaultButtonClassName,
159161
Target = target
160-
});
162+
};
163+
164+
button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
165+
166+
return Add(button);
161167
}
162168

163169
public GriddlySettings ButtonSeparator()

0 commit comments

Comments
 (0)