Skip to content

Commit 922c7d3

Browse files
Merge remote-tracking branch 'remotes/origin/development'
# Conflicts: # ej2-asp-core-mvc/ai-assistview/EJ2_ASP.MVC/ai-integrations/gemini-integration.md # ej2-asp-core-mvc/ai-assistview/EJ2_ASP.MVC/ai-integrations/openai-integration.md # ej2-asp-core-mvc/ai-assistview/images/open-ai.png # ej2-asp-core-mvc/chat-ui/EJ2_ASP.MVC/bot-integrations/integration-with-bot-framework.md # ej2-asp-core-mvc/chat-ui/EJ2_ASP.MVC/bot-integrations/integration-with-dialogflow.md # ej2-asp-core-mvc/chat-ui/EJ2_ASP.NETCORE/bot-integrations/integration-with-bot-framework.md # ej2-asp-core-mvc/chat-ui/EJ2_ASP.NETCORE/bot-integrations/integration-with-dialogflow.md # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/gemini-ai/geminicore.cs # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/gemini-ai/geminimvc.cs # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/gemini-ai/razor # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/gemini-ai/tagHelper # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/open-ai/openaicore.cs # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/open-ai/openaimvc.cs # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/open-ai/razor # ej2-asp-core-mvc/code-snippet/ai-assistview/ai-integrations/open-ai/tagHelper # ej2-asp-core-mvc/code-snippet/chat-ui/ai-integrations/Asp.net-core/gemini/tagHelper # ej2-asp-core-mvc/code-snippet/chat-ui/ai-integrations/Asp.net-core/openai/tagHelper # ej2-asp-core-mvc/datepicker/EJ2_ASP.MVC/timezone-behavior.md # ej2-asp-core-mvc/datepicker/EJ2_ASP.NETCORE/timezone-behavior.md # ej2-asp-core-mvc/datetimepicker/EJ2_ASP.MVC/timezone-behavior.md # ej2-asp-core-mvc/datetimepicker/EJ2_ASP.NETCORE/timezone-behavior.md # ej2-asp-core-toc.html # ej2-asp-mvc-toc.html
2 parents 67915ce + 5f7d658 commit 922c7d3

File tree

4 files changed

+40
-12
lines changed

4 files changed

+40
-12
lines changed

ej2-asp-core-mvc/datepicker/EJ2_ASP.MVC/timezone-behavior.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
2626

2727
N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
2828

29-
The following example demonstrates how to configure the serverTimezoneOffset property
29+
{% if page.publishingplatform == "aspnet-core" %}
3030

3131
{% tabs %}
3232
{% highlight cshtml tabtitle="CSHTML" %}
33+
{% include code-snippet/datepicker/timezone-cs1/tagHelper %}
34+
{% endhighlight %}{% endtabs %}
35+
36+
{% elsif page.publishingplatform == "aspnet-mvc" %}
37+
38+
{% tabs %}
39+
{% highlight razor tabtitle="CSHTML" %}
3340
{% include code-snippet/datepicker/timezone-cs1/razor %}
34-
{% endhighlight %}
35-
{% endtabs %}
41+
{% endhighlight %}{% endtabs %}
42+
{% endif %}

ej2-asp-core-mvc/datepicker/EJ2_ASP.NETCORE/timezone-behavior.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
2626

2727
N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
2828

29-
The following example demonstrates how to configure the serverTimezoneOffset property
29+
{% if page.publishingplatform == "aspnet-core" %}
3030

3131
{% tabs %}
3232
{% highlight cshtml tabtitle="CSHTML" %}
3333
{% include code-snippet/datepicker/timezone-cs1/tagHelper %}
34-
{% endhighlight %}
35-
{% endtabs %}
34+
{% endhighlight %}{% endtabs %}
35+
36+
{% elsif page.publishingplatform == "aspnet-mvc" %}
37+
38+
{% tabs %}
39+
{% highlight razor tabtitle="CSHTML" %}
40+
{% include code-snippet/datepicker/timezone-cs1/razor %}
41+
{% endhighlight %}{% endtabs %}
42+
{% endif %}

ej2-asp-core-mvc/datetimepicker/EJ2_ASP.MVC/timezone-behavior.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
2626

2727
N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
2828

29-
The following example demonstrates how to configure the serverTimezoneOffset property
29+
{% if page.publishingplatform == "aspnet-core" %}
3030

3131
{% tabs %}
3232
{% highlight cshtml tabtitle="CSHTML" %}
33+
{% include code-snippet/datetimepicker/timezone-cs1/tagHelper %}
34+
{% endhighlight %}{% endtabs %}
35+
36+
{% elsif page.publishingplatform == "aspnet-mvc" %}
37+
38+
{% tabs %}
39+
{% highlight razor tabtitle="CSHTML" %}
3340
{% include code-snippet/datetimepicker/timezone-cs1/razor %}
34-
{% endhighlight %}
35-
{% endtabs %}
41+
{% endhighlight %}{% endtabs %}
42+
{% endif %}

ej2-asp-core-mvc/datetimepicker/EJ2_ASP.NETCORE/timezone-behavior.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
2626

2727
N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
2828

29-
The following example demonstrates how to configure the serverTimezoneOffset property
29+
{% if page.publishingplatform == "aspnet-core" %}
3030

3131
{% tabs %}
3232
{% highlight cshtml tabtitle="CSHTML" %}
3333
{% include code-snippet/datetimepicker/timezone-cs1/tagHelper %}
34-
{% endhighlight %}
35-
{% endtabs %}
34+
{% endhighlight %}{% endtabs %}
35+
36+
{% elsif page.publishingplatform == "aspnet-mvc" %}
37+
38+
{% tabs %}
39+
{% highlight razor tabtitle="CSHTML" %}
40+
{% include code-snippet/datetimepicker/timezone-cs1/razor %}
41+
{% endhighlight %}{% endtabs %}
42+
{% endif %}

0 commit comments

Comments
 (0)