Commit 045b24dc authored by zheng liu's avatar zheng liu

Merged in dev (pull request #36)

Dev
parents dc145e9d 4de02a8f
...@@ -46,6 +46,7 @@ export class ControlnavComponent implements OnInit { ...@@ -46,6 +46,7 @@ export class ControlnavComponent implements OnInit {
if (NavList.List[index].type === 'ssh') { if (NavList.List[index].type === 'ssh') {
jQuery('app-ssh').show(); jQuery('app-ssh').show();
jQuery('app-rdp').hide(); jQuery('app-rdp').hide();
NavList.List[index].Term.term.focus();
} else if (NavList.List[index].type === 'rdp') { } else if (NavList.List[index].type === 'rdp') {
jQuery('app-ssh').hide(); jQuery('app-ssh').hide();
jQuery('app-rdp').show(); jQuery('app-rdp').show();
......
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Video} from '../../globals'; import {Video, term} from '../../globals';
import {term} from '../../globals';
@Component({ @Component({
selector: 'app-json', selector: 'app-json',
...@@ -22,12 +21,9 @@ export class JsonComponent implements OnInit { ...@@ -22,12 +21,9 @@ export class JsonComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
while (true) { setTimeout(() => {
if (term.term) { this.pause();
this.pause(); }, 2000);
break;
}
}
} }
setSpeed() { setSpeed() {
......
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