more refactoring of lib/blessed.

This commit is contained in:
Christopher Jeffrey 2015-05-05 23:58:33 -07:00
parent 8d11075b89
commit 583fa4f6f7
3 changed files with 12 additions and 34 deletions

View File

@ -1,48 +1,29 @@
/**
* Blessed
* A curses-like library for node.js.
* blessed - a high-level terminal interface library for node.js
* Copyright (c) 2013-2015, Christopher Jeffrey and contributors (MIT License).
* https://github.com/chjj/blessed
*/
/**
* Modules
*/
var program = require('./program')
, tput = require('./tput')
, widget = require('./widget')
, colors = require('./colors')
, unicode = require('./unicode');
/**
* Blessed
*/
function blessed() {
return program.apply(null, arguments);
return blessed.program.apply(null, arguments);
}
blessed.program = blessed.Program = program;
blessed.tput = blessed.Tput = tput;
blessed.widget = widget;
blessed.colors = colors;
blessed.unicode = unicode;
blessed.program = blessed.Program = require('./program');
blessed.tput = blessed.Tput = require('./tput');
blessed.widget = require('./widget');
blessed.colors = require('./colors');
blessed.unicode = require('./unicode');
blessed.helpers = require('./helpers');
Object.keys(blessed.widget).forEach(function(name) {
blessed[name] = blessed.widget[name];
});
blessed.helpers.sprintf = blessed.tput.sprintf;
blessed.helpers.tryRead = blessed.tput.tryRead;
blessed.helpers.merge(blessed, blessed.helpers);
blessed.helpers = {
sprintf: blessed.tput.sprintf,
merge: blessed.tput.merge,
tryRead: blessed.tput.tryRead
};
Object.keys(widget.helpers).forEach(function(key) {
blessed.helpers[key] = widget.helpers[key];
blessed[key] = widget.helpers[key];
});
blessed.helpers.merge(blessed, blessed.widget);
/**
* Expose

View File

@ -2983,7 +2983,6 @@ Tput.utoa = Tput.prototype.utoa = {
exports = Tput;
exports.sprintf = sprintf;
exports.merge = merge;
exports.tryRead = tryRead;
module.exports = exports;

View File

@ -42,5 +42,3 @@ widget.classes.forEach(function(name) {
var file = name.toLowerCase();
widget[name] = widget[file] = require('./widgets/' + file);
});
widget.helpers = require('./helpers');