slap-editor/slap
1
1
Fork 0
mirror of https://github.com/slap-editor/slap.git synced 2024-10-26 13:17:38 +03:00
Code Issues Projects Releases Wiki Activity

fix(test): updates deps, opts.screen.logger always set

Browse Source
This commit is contained in:
Dan Kaplun 2015-06-27 13:06:19 -04:00
parent a67533391c
commit 4be8c66299
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cli.js
View File

@ -69,15 +69,14 @@ module.exports = function (options) {
opts = _.merge(opts, options);
return Slap.getUserDir().catch(Promise.resolve()).then(function (userDir) {
if (userDir) opts = _.merge({logger: {file: path.resolve(userDir, package.name+'.log')}}, opts);
opts = _.merge({
editor: {logger: opts.logger},
screenOpts: {logger: opts.logger}
}, opts);
opts = _.merge({editor: {logger: opts.logger}}, opts);
util.logger(opts.logger);
util.logger.info("loading...");
util.logger.verbose("configuration:", opts);
if (!opts.screen) opts.screen = new blessed.Screen(opts.screenOpts);
opts.screen.logger = opts.logger;
var slap = new Slap(opts);
Promise.all(opts._.map(function (path, i) {

4
package.json
View File

@ -21,10 +21,10 @@
"author": "",
"license": "MIT",
"dependencies": {
"base-widget": "^1.0.0",
"base-widget": "^1.0.2",
"blessed": "^0.1.60",
"bluebird": "^2.3.6",
"editor-widget": "^1.0.2",
"editor-widget": "^1.0.3",
"lodash": "^3.9.3",
"mkdirp": "^0.5.0",
"node-clap": "^0.0.5",