Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow hardcoded values and resource bindings in IncludeInPage, Visible properties #1680

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Allow hardcoded values and resource bindings in IncludeInPage, Visible properties #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Framework/Framework/Controls/DotvvmControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public ClientIDMode ClientIDMode
/// <remarks>
/// Essentially wraps Knockout's 'if' binding.
/// </remarks>
[MarkupOptions(AllowHardCodedValue = false)]
[MarkupOptions]
public bool IncludeInPage
{
get { return (bool)GetValue(IncludeInPageProperty)!; }
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Framework/Controls/HtmlGenericControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public string? InnerText
/// <summary>
/// Gets or sets whether the control is visible. When set to false, `style="display: none"` will be added to this control.
/// </summary>
[MarkupOptions(AllowHardCodedValue = false)]
[MarkupOptions]
public bool Visible
{
get { return (bool)GetValue(VisibleProperty)!; }
Expand Down
6 changes: 2 additions & 4 deletions src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,7 @@
},
"IncludeInPage": {
"type": "System.Boolean",
"defaultValue": true,
"onlyBindings": true
"defaultValue": true
}
},
"DotVVM.Framework.Controls.EmptyData": {
Expand Down Expand Up @@ -1016,8 +1015,7 @@
},
"Visible": {
"type": "System.Boolean",
"defaultValue": true,
"onlyBindings": true
"defaultValue": true
}
},
"DotVVM.Framework.Controls.HtmlLiteral": {
Expand Down
Loading