Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #31 from sbwalker/master

Browse Source 
Master
This commit is contained in:
Shaun Walker
2019-06-19 20:48:37 -04:00
committed by GitHub
parent ab2ea33d64 a7e53486b3
commit 3606ffc3d6
1 changed files with 309 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -8,6 +8,8 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@inject SiteState SiteState @inject SiteState SiteState
@inject IUriHelper UriHelper @inject IUriHelper UriHelper
@inject INavigationInterception NavigationInterception
@inject IComponentContext ComponentContext
@inject IJSRuntime jsRuntime @inject IJSRuntime jsRuntime
@inject IAliasService AliasService @inject IAliasService AliasService
@inject ITenantService TenantService @inject ITenantService TenantService
@ -17,6 +19,7 @@
@inject IModuleService ModuleService @inject IModuleService ModuleService
@inject IModuleDefinitionService ModuleDefinitionService @inject IModuleDefinitionService ModuleDefinitionService
@inject IThemeService ThemeService @inject IThemeService ThemeService
@implements IHandleAfterRender
@DynamicComponent @DynamicComponent
@ -26,9 +29,11 @@
[Parameter] Action<PageState> OnStateChange { get; set; } [Parameter] Action<PageState> OnStateChange { get; set; }
RenderFragment DynamicComponent { get; set; }
private string _absoluteUri;
PageState pagestate; PageState pagestate;
RenderFragment DynamicComponent { get; set; }
string _absoluteUri;
bool _navigationInterceptionEnabled;
protected override void OnInit() protected override void OnInit()
{ {
@ -240,12 +245,17 @@
private async void OnLocationChanged(object sender, LocationChangedEventArgs args) private async void OnLocationChanged(object sender, LocationChangedEventArgs args)
{ {
_absoluteUri = args.Location; _absoluteUri = args.Location;
await LocationChanged(); await Refresh();
} }
public async Task LocationChanged() Task IHandleAfterRender.OnAfterRenderAsync()
{ {
await Refresh(); if (!_navigationInterceptionEnabled && ComponentContext.IsConnected)
{
_navigationInterceptionEnabled = true;
return NavigationInterception.EnableNavigationInterceptionAsync();
}
return Task.CompletedTask;
} }
private Dictionary<string, string> ParseQueryString(string path) private Dictionary<string, string> ParseQueryString(string path)