From f0fbea48c6f70ff98ed0a062e5603833737563f2 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Sat, 23 Jan 2016 13:04:14 -0500 Subject: [PATCH] moving file work outside of index.js --- Gruntfile.js | 10 ++++++---- index.js | 18 ++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6644db8..c70e1d2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -21,10 +21,12 @@ module.exports = function(grunt) { grunt.registerTask('default', ['watch']); grunt.registerTask('convert-tabs-to-html', function(){ var done = this.async(); - converter('test.txt', function(result){ - console.log(result); - fs.writeFile('result.html', result, function(){ - done(); + fs.readFile('test.txt', 'utf8', function(err, data){ + converter(data, function(result){ + console.log(result); + fs.writeFile('result.html', result, function(){ + done(); + }); }); }); }); diff --git a/index.js b/index.js index bcb7188..e984c0c 100755 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ var fs = require('fs'); -module.exports = function(file_path, callback){ +module.exports = function(input, callback){ var html_stack = []; @@ -49,16 +49,10 @@ module.exports = function(file_path, callback){ html += popHTMLStack(-1, previous_line_num_tabs); callback(html); } - fs.readFile(file_path, 'utf8', function(err, data){ - if(err){ - console.log(err); - } else { - parseFile(data, function(html){ - var result = '\n'; - result += html; - result += ''; - callback(result); - }); - } + parseFile(input, function(html){ + var result = '\n'; + result += html; + result += ''; + callback(result); }); };