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