Skip to content

Commit 4e58df3

Browse files
committed
Add signalr conditional.
1 parent 8a132ca commit 4e58df3

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@using Abp.Web.Security.AntiForgery
33
@using Abp.Configuration.Startup
44
@using AbpCompanyName.AbpProjectName
5+
@using AbpCompanyName.AbpProjectName.SignalR
56
@using AbpCompanyName.AbpProjectName.Web.Resources
67
@inject AbpCompanyName.AbpProjectName.Timing.AppTimes AppTimes
78
@inject IAbpAntiForgeryManager AbpAntiForgeryManager
@@ -26,7 +27,6 @@
2627

2728
<environment names="Development">
2829
<!-- TODO: Bundles! -->
29-
3030
<!-- Fonts -->
3131
<link href="~/fonts/roboto/roboto.css" rel="stylesheet" asp-append-version="true" />
3232
<link href="~/fonts/material-icons/materialicons.css" rel="stylesheet" asp-append-version="true" />
@@ -75,9 +75,9 @@
7575
}
7676

7777
@RenderBody()
78-
78+
7979
<vc:account-languages></vc:account-languages>
80-
80+
8181
<div class="row">
8282
<div class="col-xs-12 text-center" style="color: #e9e9e9">
8383
<small>&copy; @DateTime.Now.Year AbpProjectName. <b>Version </b> @AppVersionHelper.Version [@AppVersionHelper.ReleaseDate.ToString("yyyyMMdd")]</small>
@@ -106,8 +106,6 @@
106106
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
107107
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
108108

109-
<script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
110-
111109
<script src="~/js/admin.js"></script>
112110
<script src="~/js/main.js" asp-append-version="true"></script>
113111
</environment>
@@ -126,10 +124,6 @@
126124
<script src="~/AbpServiceProxies/GetAll?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
127125
<script src="~/AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
128126

129-
<!-- SignalR scripts -->
130-
<script src="~/signalr/hubs"></script>
131-
@*@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.signalr.js")*@
132-
133127
@WebResourceManager.RenderScripts()
134128

135129
<!-- View specific scripts -->

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@using Abp.Web.Security.AntiForgery
33
@using Abp.Configuration.Startup
44
@using AbpCompanyName.AbpProjectName
5+
@using AbpCompanyName.AbpProjectName.SignalR
56
@using AbpCompanyName.AbpProjectName.Web.Resources
67
@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.SideBarNav
78
@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.SideBarUserArea
@@ -109,9 +110,9 @@
109110
<!-- Call Search -->
110111
<li><a href="javascript:void(0);" class="js-search" data-close="true"><i class="material-icons">search</i></a></li>
111112
<!-- #END# Call Search -->
112-
113+
113114
@await Component.InvokeAsync(typeof(TopBarLanguageSwitchViewComponent))
114-
115+
115116
<li class="pull-right"><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
116117
</ul>
117118
</div>
@@ -121,7 +122,7 @@
121122
<section>
122123
<!-- Left Sidebar -->
123124
<aside id="leftsidebar" class="sidebar">
124-
125+
125126
@await Component.InvokeAsync(typeof(SideBarUserAreaViewComponent))
126127
@await Component.InvokeAsync(typeof(SideBarNavViewComponent), new { activeMenu = ViewBag.CurrentPageName })
127128

@@ -314,7 +315,10 @@
314315
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
315316
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
316317

317-
<script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
318+
@if (SignalRFeature.IsAvailable)
319+
{
320+
<script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
321+
}
318322

319323
<script src="~/lib/push.js/push.js" asp-append-version="true"></script>
320324
<script src="~/js/main.js" asp-append-version="true"></script>
@@ -334,9 +338,12 @@
334338
<script src="~/AbpServiceProxies/GetAll?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
335339
<script src="~/AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
336340

341+
@if (SignalRFeature.IsAvailable)
342+
{
337343
<!-- SignalR scripts -->
338-
<script src="~/signalr/hubs"></script>
339-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
344+
<script src="~/signalr/hubs"></script>
345+
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
346+
}
340347

341348
@WebResourceManager.RenderScripts();
342349

0 commit comments

Comments
 (0)