readline: fixes scoping bug

Signed-off-by: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Dan Kaplun 2014-05-17 02:25:10 -05:00 committed by Fedor Indutny
parent 4a2c349473
commit 655ec2113a
2 changed files with 10 additions and 10 deletions

View File

@ -958,15 +958,6 @@ var escapeCodeReAnywhere = new RegExp([
].join('|')); ].join('|'));
function emitKeys(stream, s) { function emitKeys(stream, s) {
var ch,
key = {
name: undefined,
ctrl: false,
meta: false,
shift: false
},
parts;
if (util.isBuffer(s)) { if (util.isBuffer(s)) {
if (s[0] > 127 && util.isUndefined(s[1])) { if (s[0] > 127 && util.isUndefined(s[1])) {
s[0] -= 128; s[0] -= 128;
@ -986,7 +977,15 @@ function emitKeys(stream, s) {
buffer = buffer.concat(s.split('')); buffer = buffer.concat(s.split(''));
buffer.forEach(function(s) { buffer.forEach(function(s) {
key.sequence = s; var ch,
key = {
sequence: s,
name: undefined,
ctrl: false,
meta: false,
shift: false
},
parts;
if (s === '\r') { if (s === '\r') {
// carriage return // carriage return

View File

@ -227,6 +227,7 @@ function isWarned(emitter) {
var remainingKeypresses = keypresses.slice(); var remainingKeypresses = keypresses.slice();
function keypressListener (ch, key) { function keypressListener (ch, key) {
callCount++; callCount++;
if (ch) assert(!key.code);
assert.equal(key.sequence, remainingKeypresses.shift()); assert.equal(key.sequence, remainingKeypresses.shift());
}; };
readline.emitKeypressEvents(fi); readline.emitKeypressEvents(fi);