github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 06:35:13 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2014-04-10 17:26:14 +01:00
commit f7ea925e67
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee
View file

@ -94,15 +94,12 @@ module.exports =
logger.log project_id:project_id, file_id:file_id, dumpPath:dumpPath, "tpds update write stream finished" logger.log project_id:project_id, file_id:file_id, dumpPath:dumpPath, "tpds update write stream finished"
callback null, dumpPath callback null, dumpPath
stream.resume()
readFileIntoTextArray = (path, callback)-> readFileIntoTextArray = (path, callback)->
fs.readFile path, "utf8", (error, content = "") -> fs.readFile path, "utf8", (error, content = "") ->
if error? if error?
logger.err path:path, "error reading file into text array" logger.err path:path, "error reading file into text array"
return callback(err) return callback(err)
lines = content.split("\n") lines = content.split(/\r\n|\n|\r/)
callback error, lines callback error, lines