ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit afe8218c755f44dfe5b997e306a5094f64698513
parent bfe73c03caa51f56754b4d29ddd6a10d8e1f625e
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Fri, 26 Jun 2015 12:54:42 +0300

Merge branch 'vachix-master'

Diffstat:
Msrc/core/Database.js | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/Database.js b/src/core/Database.js @@ -37,8 +37,9 @@ export default { fs.readFile(fileName, {encoding: 'utf8'}, (err2, data2) => { resolve(err2 ? null : parseJade(uri, data2)); }); + } else { + resolve(parseJade(uri, data)); } - resolve(parseJade(uri, data)); }); }).then((page) => { Dispatcher.dispatch({