update files

This commit is contained in:
nuintun 2015-11-26 23:00:11 +08:00
parent c031a18d4e
commit 99eccf36b3
2 changed files with 15 additions and 20 deletions

View File

@ -53,26 +53,34 @@ function scroll(xterm, parent){
* @param xtermNode
*/
function createXTerm(name, xtermNode){
var timer;
var runtime = window.AppRuntime[name];
if (runtime) {
runtime.xterm.focus();
xtermNode.innerHTML = runtime.xterm.screen;
} else {
var xterm = new Terminal({
rows: 66,
scrollback: 66,
cursorBlink: false,
convertEOL: true,
fgColor: 'inherit',
bgColor: 'transparent'
bgColor: 'transparent',
onscreen: function (screen){
if (Terminal.focus === this) {
clearTimeout(timer);
timer = setTimeout(function (){
xtermNode.innerHTML = screen;
scroll(xterm, xtermNode);
}, 0);
}
}
});
xterm.open();
xterm.focus();
xtermNode.innerHTML = xterm.screen;
window.AppRuntime[name] = {
xterm: xterm
};
@ -181,8 +189,6 @@ module.exports = Vue.component('app-main', {
context.expandCommand = trigger && trigger.contains(target);
}, false);
var timer;
ipc.on('emulator', function (event, type, project, data){
var runtime = window.AppRuntime[project.name];
@ -199,18 +205,7 @@ module.exports = Vue.component('app-main', {
break;
}
clearTimeout(timer);
runtime.xterm.write(data);
if (project.name === context.project.name) {
timer = setTimeout(function (){
var xtermNode = context.$els.terminal;
xtermNode.innerHTML = runtime.xterm.screen;
scroll(runtime.xterm, xtermNode);
}, 0);
}
} else {
event.sender.send('emulator', project, 'stop');
}

View File

@ -17,6 +17,8 @@ module.exports = function (Terminal){
Terminal.focus.blur();
}
Terminal.focus = this;
if (this.cursor) {
this.showCursor();
}
@ -24,8 +26,6 @@ module.exports = function (Terminal){
if (this.cursorBlink) {
this.startBlink();
}
Terminal.focus = this;
};
/**