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

Literal render binding even in server mode #1246

Merged
merged 1 commit into from
Jan 19, 2022
Merged

Literal render binding even in server mode #1246

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
4 changes: 2 additions & 2 deletions src/Framework/Framework/Controls/Literal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protected override void RenderControl(IHtmlWriter writer, IDotvvmRequestContext

// render Knockout data-bind
string? expression = null;
if (textBinding != null && !r.HtmlState.RenderOnServer(this))
if (textBinding != null)
{
expression = textBinding.GetKnockoutBindingExpression(this);
if (isFormattingRequired)
Expand All @@ -172,7 +172,7 @@ protected override void RenderControl(IHtmlWriter writer, IDotvvmRequestContext
writer.WriteKnockoutDataBindComment("text", expression);
}

if (expression == null)
if (expression == null || r.HtmlState.RenderOnServer(this))
{
string textToDisplay;
if (isFormattingRequired)
Expand Down
12 changes: 6 additions & 6 deletions src/Tests/ControlTests/testoutputs/SimpleControlTests.Literal_ClientServerRendering.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

<!-- control syntax, server rendering -->
<span>
<span>10000000</span>
<span>0.11111</span>
<span>8/11/2020 4:01:44 PM</span>
<span data-bind="text: int">10000000</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, float)">0.11111</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, date)">8/11/2020 4:01:44 PM</span>
</span>

<!-- control syntax, client rendering, format string -->
Expand All @@ -31,9 +31,9 @@

<!-- control syntax, server rendering, format string -->
<span>
<span>989680</span>
<span>11.11%</span>
<span>Tuesday</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;X&quot;, int)">989680</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;P2&quot;, float)">11.11%</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;dddd&quot;, date)">Tuesday</span>
</span>
</body>
</html>
2 changes: 1 addition & 1 deletion src/Tests/Runtime/DotvvmControlRenderedHtmlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public void Literal_DateTimeToBrowserLocalTime_RenderOnServer()
{
var vm = new LiteralDateTimeViewModel();
var control = $@"@viewModel {vm.GetType().FullName}
<dot:Literal Text={{value: DateTime.ToBrowserLocalTime()}} RenderSettings.Mode=Server /><dot:Literal Text={{value: NullableDateTime.ToBrowserLocalTime()}} RenderSettings.Mode=Server />";
<dot:Literal Text={{resource: DateTime.ToBrowserLocalTime()}} RenderSettings.Mode=Server /><dot:Literal Text={{resource: NullableDateTime.ToBrowserLocalTime()}} RenderSettings.Mode=Server />";

var dotvvmBuilder = CreateDotvvmViewBuilder(control);
var context = CreateContext(vm);
Expand Down