kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed anchor property and hash is only set if there is anchor

Browse Source
This commit is contained in:
Michael Atwood 2020-06-30 12:49:56 -07:00
parent cb2d529689
commit 5e816ea912
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Client/UI/PageState.cs
View File

@ -15,7 +15,6 @@ namespace Oqtane.UI
public Uri Uri { get; set; } public Uri Uri { get; set; }
public Dictionary<string, string> QueryString { get; set; } public Dictionary<string, string> QueryString { get; set; }
public string UrlParameters { get; set; } public string UrlParameters { get; set; }
public string Anchor { get; set; }
public int ModuleId { get; set; } public int ModuleId { get; set; }
public string Action { get; set; } public string Action { get; set; }
public bool EditMode { get; set; } public bool EditMode { get; set; }

18
Oqtane.Client/UI/SiteRouter.razor
View File

@ -78,7 +78,6 @@
var moduleid = -1; var moduleid = -1;
var action = string.Empty; var action = string.Empty;
var urlparameters = string.Empty; var urlparameters = string.Empty;
var anchor = string.Empty;
var editmode = false; var editmode = false;
var reload = Reload.None; var reload = Reload.None;
var lastsyncdate = DateTime.UtcNow; var lastsyncdate = DateTime.UtcNow;
@ -89,12 +88,6 @@
// get path // get path
var path = uri.LocalPath.Substring(1); var path = uri.LocalPath.Substring(1);
//set anchor
if (uri.Fragment.StartsWith('#'))
{
anchor = uri.Fragment.Remove(0, 1);
}
// parse querystring // parse querystring
var querystring = ParseQueryString(uri.Query); var querystring = ParseQueryString(uri.Query);
@ -190,17 +183,17 @@
int modIdPos = 0; int modIdPos = 0;
int actionPos = 0; int actionPos = 0;
int ulrParametersPos = 0; int urlParametersPos = 0;
for (int i = 0; i < segments.Length; i++) for (int i = 0; i < segments.Length; i++)
{ {
if (segments[i] == Constants.UrlParametersDelimiter) if (segments[i] == Constants.UrlParametersDelimiter)
{ {
ulrParametersPos = i + 1; urlParametersPos = i + 1;
} }
if (i >= ulrParametersPos && ulrParametersPos != 0) if (i >= urlParametersPos && urlParametersPos != 0)
{ {
urlparameters += "/" + segments[i]; urlparameters += "/" + segments[i];
} }
@ -238,9 +231,9 @@
} }
if (ulrParametersPos > 0) if (urlParametersPos > 0)
{ {
path = path.Replace("/" + segments[ulrParametersPos - 1] + urlparameters, ""); path = path.Replace("/" + segments[urlParametersPos - 1] + urlparameters, "");
} }
// remove trailing slash so it can be used as a key for Pages // remove trailing slash so it can be used as a key for Pages
@ -311,7 +304,6 @@
Uri = new Uri(_absoluteUri, UriKind.Absolute), Uri = new Uri(_absoluteUri, UriKind.Absolute),
QueryString = querystring, QueryString = querystring,
UrlParameters = urlparameters, UrlParameters = urlparameters,
Anchor = anchor,
ModuleId = moduleid, ModuleId = moduleid,
Action = action, Action = action,
EditMode = editmode, EditMode = editmode,

4
Oqtane.Shared/Shared/Utilities.cs
View File

@ -76,8 +76,8 @@ namespace Oqtane.Shared
: $"{path}", : $"{path}",
Query = querystring, Query = querystring,
}; };
anchor = string.IsNullOrEmpty(anchor) ? "" : "#" + anchor;
var navigateUrl = uriBuilder.Uri.PathAndQuery + "#" + anchor; var navigateUrl = uriBuilder.Uri.PathAndQuery + anchor;
return navigateUrl; return navigateUrl;
} }