diff --git a/reload/reload.component.ts b/reload/reload.component.ts index f0179aca..92eade58 100644 --- a/reload/reload.component.ts +++ b/reload/reload.component.ts @@ -16,20 +16,33 @@ export class ReloadComponent { public ngOnInit() { HelperFunctions.scroll(); - var URL = Session.getReloadUrl(); + let URL = Session.getReloadUrl(); if (URL && URL["path"] && URL["path"] != null && URL["path"] != "") { - var url = URL["path"]; - var host = URL["host"]; - var paramsObject = ((URL["params"] && URL["params"] != null) ? Session.getParamsObj(URL["params"]) : null); + let url: string = URL["path"]; + let host = URL["host"]; + let paramsObject = ((URL["params"] && URL["params"] != null) ? Session.getParamsObj(URL["params"]) : null); + let hash = url.indexOf("#"); if (host == (location.protocol + "//" + location.host)) { + let fragment = (hash !== -1)?url.slice(hash + 1):null; + if(fragment) { + url = url.slice(0, hash); + } let baseUrl = (document && document.getElementsByTagName('base')) ? document.getElementsByTagName('base')[0].href.split(document.location.host)[1] : "/"; url = (baseUrl.length > 1 && url.indexOf(baseUrl) != -1) ? ("/" + url.split(baseUrl)[1]) : url; if (paramsObject) { Session.setReloadUrl("", "", "") - this._router.navigate([url], {queryParams: paramsObject}); + if(fragment) { + this._router.navigate([url], {queryParams: paramsObject, fragment: fragment}); + } else { + this._router.navigate([url], {queryParams: paramsObject}); + } } else { Session.setReloadUrl("", "", "") - this._router.navigate([url]); + if(fragment) { + this._router.navigate([url], {fragment: fragment}); + } else { + this._router.navigate([url]); + } } } else { Session.setReloadUrl("", "", "")