Commit 661fcea5 authored by zheng liu's avatar zheng liu

Merged in dev (pull request #79)

Dev
parents 5e207ee9 015eeb09
......@@ -275,9 +275,10 @@ export class AppService implements OnInit {
this._router.navigate([document.location.pathname]);
}
// jQuery('angular2').show();
} else if (document.location.pathname === '/luna/connect') {
User.logined = true;
} else {
// this.browser();
if (document.location.pathname !== '/luna/connect') {
this._http.get_user_profile()
.subscribe(
data => {
......@@ -321,24 +322,34 @@ export class AppService implements OnInit {
}
}
}
} else {
this._router.navigate(['FOF']);
// jQuery('angular2').show();
}
}
browser() {
else {
this;
.
_router;
.
navigate(['FOF']);
// jQuery('angular2').show();
}
}
browser();
{
this._http.report_browser();
}
}
getQueryString(name) {
getQueryString(name);
{
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
const r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
}
return null;
}
}
//
//
......
......@@ -50,6 +50,7 @@ export class ElementGuacamoleComponent implements OnInit {
.subscribe(
data => {
this._localStorage.set('user', data['user']);
window.location.reload();
}
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment