yexuejc/command-manager
1
0
Fork 0
mirror of https://github.com/nuintun/command-manager.git synced 2025-06-26 17:12:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

update files

Browse Source
This commit is contained in:
nuintun 2015-11-27 09:34:50 +08:00
parent b6eedc11dc
commit 65e67f90da
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/emulator.js
View File

@ -83,6 +83,7 @@ module.exports = {
switch (action) {
case 'start':
if (!emulator) {
var stream;
var env = {};
Object.keys(process.env).forEach(function (key){
@ -99,14 +100,14 @@ module.exports = {
command: project.command.value
});
var stream = emulator.start();
stream = emulator.start();
stream.stdout.on('data', function (data){
event.sender.send('data', project, data);
event.sender.send('emulator', 'data', project, data);
});
stream.stderr.on('error', function (error){
event.sender.send('error', project, error);
event.sender.send('emulator', 'error', project, error);
emulator.stop();
@ -114,7 +115,7 @@ module.exports = {
});
stream.on('close', function (signal){
event.sender.send('close', project, signal);
event.sender.send('emulator', 'close', project, signal);
delete emulators[key];
});

66
static/js/components/app-main/index.js
View File

@ -53,35 +53,41 @@ function scroll(xterm, parent){
* @param xtermNode
*/
function createXTerm(name, xtermNode){
//var timer;
//var runtime = window.AppRuntime[name];
var timer;
var runtime = window.AppRuntime[name];
//if (runtime) {
// runtime.xterm.focus();
//} else {
// var xterm = new Terminal({
// rows: 66,
// scrollback: 66,
// convertEOL: true,
// fgColor: 'inherit',
// bgColor: 'transparent',
// onscreen: function (screen){
// if (this.isFocused()) {
// clearTimeout(timer);
//
// timer = setTimeout(function (){
// //xtermNode.innerHTML = screen;
//
// scroll(xterm, xtermNode);
// }, 10);
// }
// }
// });
//
// xterm.open();
if (runtime) {
runtime.xterm.focus();
} else {
var xterm = new Terminal({
rows: 66,
scrollback: 66,
convertEOL: true,
fgColor: 'inherit',
bgColor: 'transparent',
onscreen: function (screen){
if (this.isFocused()) {
setImmediate(function (){
xtermNode.innerHTML = screen;
scroll(xterm, xtermNode);
});
//clearTimeout(timer);
window.AppRuntime[name] = true;
//}
//timer = setTimeout(function (){
// xtermNode.innerHTML = screen;
//}, 0);
//
//scroll(xterm, xtermNode);
}
}
});
xterm.open();
window.AppRuntime[name] = {
xterm: xterm
};
}
}
module.exports = Vue.component('app-main', {
@ -190,9 +196,7 @@ module.exports = Vue.component('app-main', {
var runtime = window.AppRuntime[project.name];
if (runtime) {
if (project.name === context.project.name) {
context.$els.terminal.innerHTML = data;
}
runtime.xterm.write(data + '');
} else {
event.sender.send('emulator', project, 'stop');
}
@ -200,7 +204,5 @@ module.exports = Vue.component('app-main', {
},
ready: function (){
createXTerm(this.project.name, this.$els.terminal);
new Worker('static/js/components/app-main/worker.js');
}
});