diff --git a/lib/blessed.js b/lib/blessed.js index 05f748b..f00f7e4 100644 --- a/lib/blessed.js +++ b/lib/blessed.js @@ -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 diff --git a/lib/tput.js b/lib/tput.js index 9d69918..c579dec 100644 --- a/lib/tput.js +++ b/lib/tput.js @@ -2983,7 +2983,6 @@ Tput.utoa = Tput.prototype.utoa = { exports = Tput; exports.sprintf = sprintf; -exports.merge = merge; exports.tryRead = tryRead; module.exports = exports; diff --git a/lib/widget.js b/lib/widget.js index a43c797..a26a81e 100644 --- a/lib/widget.js +++ b/lib/widget.js @@ -42,5 +42,3 @@ widget.classes.forEach(function(name) { var file = name.toLowerCase(); widget[name] = widget[file] = require('./widgets/' + file); }); - -widget.helpers = require('./helpers');