Merge pull request #1376 from Tyriar/1324_move_zmodem_demo
Move zmodem demo to demo/
This commit is contained in:
@@ -7,16 +7,16 @@ var pty = require('node-pty');
|
|||||||
var terminals = {},
|
var terminals = {},
|
||||||
logs = {};
|
logs = {};
|
||||||
|
|
||||||
app.use('/build', express.static(__dirname + '/../../../../build'));
|
app.use('/build', express.static(__dirname + '/../../build'));
|
||||||
app.use('/demo', express.static(__dirname + '/../../../../demo'));
|
app.use('/demo', express.static(__dirname + '/../../demo'));
|
||||||
app.use('/zmodemjs', express.static(__dirname + '/../../../../node_modules/zmodem.js/dist'));
|
app.use('/zmodemjs', express.static(__dirname + '/../../node_modules/zmodem.js/dist'));
|
||||||
|
|
||||||
app.get('/', function(req, res){
|
app.get('/', function(req, res){
|
||||||
res.sendFile(__dirname + '/index.html');
|
res.sendFile(__dirname + '/index.html');
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/style.css', function(req, res){
|
app.get('/style.css', function(req, res){
|
||||||
res.sendFile(__dirname + '/style.css');
|
res.sendFile(__dirname + '../style.css');
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/main.js', function(req, res){
|
app.get('/main.js', function(req, res){
|
||||||
@@ -6,6 +6,11 @@ var term,
|
|||||||
socket,
|
socket,
|
||||||
pid;
|
pid;
|
||||||
|
|
||||||
|
Terminal.applyAddon(fit);
|
||||||
|
Terminal.applyAddon(attach);
|
||||||
|
Terminal.applyAddon(zmodem);
|
||||||
|
Terminal.applyAddon(search);
|
||||||
|
|
||||||
var terminalContainer = document.getElementById('terminal-container'),
|
var terminalContainer = document.getElementById('terminal-container'),
|
||||||
actionElements = {
|
actionElements = {
|
||||||
findNext: document.querySelector('#find-next'),
|
findNext: document.querySelector('#find-next'),
|
||||||
+1
-2
@@ -76,8 +76,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node demo/app",
|
"start": "node demo/app",
|
||||||
"prestart-zmodem": "npm run build",
|
"start-zmodem": "node demo/zmodem/app",
|
||||||
"start-zmodem": "node build/addons/zmodem/demo/app",
|
|
||||||
"lint": "tslint src/*.ts src/**/*.ts",
|
"lint": "tslint src/*.ts src/**/*.ts",
|
||||||
"test": "gulp test",
|
"test": "gulp test",
|
||||||
"build:docs": "jsdoc -c jsdoc.json",
|
"build:docs": "jsdoc -c jsdoc.json",
|
||||||
|
|||||||
@@ -38,11 +38,13 @@ import { Terminal } from 'xterm';
|
|||||||
|
|
||||||
let zmodem;
|
let zmodem;
|
||||||
|
|
||||||
export interface IZModemOptions {
|
export interface IZmodemOptions {
|
||||||
noTerminalWriteOutsideSession?: boolean;
|
noTerminalWriteOutsideSession?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function zmodemAttach(term: Terminal, ws: WebSocket, opts: IZModemOptions = {}): void {
|
function zmodemAttach(ws: WebSocket, opts: IZmodemOptions = {}): void {
|
||||||
|
var term = this;
|
||||||
|
|
||||||
const senderFunc = (octets: ArrayLike<number>) => ws.send(new Uint8Array(octets));
|
const senderFunc = (octets: ArrayLike<number>) => ws.send(new Uint8Array(octets));
|
||||||
|
|
||||||
let zsentry;
|
let zsentry;
|
||||||
@@ -85,8 +87,8 @@ export function zmodemAttach(term: Terminal, ws: WebSocket, opts: IZModemOptions
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function apply(terminalConstructor: typeof Terminal): void {
|
export function apply(terminalConstructor: typeof Terminal): void {
|
||||||
zmodem = (typeof window === 'object') ? (<any>window).ZModem : {Browser: null}; // Nullify browser for tests
|
zmodem = (typeof window === 'object') ? (<any>window).Zmodem : {Browser: null}; // Nullify browser for tests
|
||||||
|
|
||||||
(<any>terminalConstructor.prototype).zmodemAttach = zmodemAttach.bind(this, this);
|
(<any>terminalConstructor.prototype).zmodemAttach = zmodemAttach;
|
||||||
(<any>terminalConstructor.prototype).zmodemBrowser = zmodem.Browser;
|
(<any>terminalConstructor.prototype).zmodemBrowser = zmodem.Browser;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user