@@ -107,12 +107,12 @@ export class HeaderComponent implements OnInit {
107107 button . route !== undefined &&
108108 ( ! button . buttons || ! button . buttons . length )
109109 ) {
110- this . preNavigate ( button . route )
110+ this . goto ( button . route )
111111 } else {
112112 this . updateMenu ( this . menu , treeLocation , true )
113113 }
114114 } else if ( button . route !== undefined ) {
115- this . preNavigate ( button . route )
115+ this . goto ( button . route )
116116 }
117117 }
118118
@@ -257,28 +257,14 @@ export class HeaderComponent implements OnInit {
257257 : null
258258 }
259259
260- goto ( url ) {
261- if ( url === 'signin' ) {
260+ goto ( route : string ) {
261+ if ( route === 'signin' ) {
262262 this . _router . navigate ( [ ApplicationRoutes . signin ] )
263263 this . mobileMenuState = false
264- } else {
265- ; ( this . window as any ) . outOfRouterNavigation ( environment . BASE_URL + url )
266- }
267- }
268-
269- preNavigate ( route : string ) {
270- if ( route . indexOf ( '://' ) >= 0 ) {
271- this . navigateTo ( route )
272- } else {
273- this . navigateTo ( environment . INFO_SITE + route )
274- }
275- }
276-
277- navigateTo ( val ) {
278- if ( val === '/signout' && environment . proxyMode ) {
264+ } else if ( route === 'signout' && environment . proxyMode ) {
279265 this . _user . noRedirectLogout ( ) . subscribe ( )
280266 } else {
281- ; ( this . window as any ) . outOfRouterNavigation ( val )
267+ ; ( this . window as any ) . outOfRouterNavigation ( environment . INFO_SITE + route )
282268 }
283269 }
284270}
0 commit comments