agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-11 15:10:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3495 from overleaf/ae-prettier-2

Browse Source 
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
This commit is contained in:
Alf Eaton
2021-04-14 14:17:21 +01:00
committed by Copybot
parent 930d7ba028
commit 1ebc8a79cb
582 changed files with 20382 additions and 20374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Documents/DocumentController.js
+41 -43
View File
@@ -23,7 +23,7 @@ const _ = require('lodash')
module.exports = {
getDocument(req, res, next) {
if (next == null) {
next = function(error) {}
next = function (error) {}
}
const project_id = req.params.Project_id
const { doc_id } = req.params
@@ -32,7 +32,7 @@ module.exports = {
return ProjectGetter.getProject(
project_id,
{ rootFolder: true, overleaf: true },
function(error, project) {
function (error, project) {
if (error != null) {
return next(error)
}
@@ -41,7 +41,7 @@ module.exports = {
}
return ProjectLocator.findElement(
{ project, element_id: doc_id, type: 'doc' },
function(error, doc, path) {
function (error, doc, path) {
if (error != null) {
OError.tag(error, 'error finding element for getDocument', {
doc_id,
@@ -49,45 +49,43 @@ module.exports = {
})
return next(error)
}
return ProjectEntityHandler.getDoc(project_id, doc_id, function(
error,
lines,
rev,
version,
ranges
) {
if (error != null) {
OError.tag(
error,
'error finding doc contents for getDocument',
{
doc_id,
project_id
}
)
return next(error)
return ProjectEntityHandler.getDoc(
project_id,
doc_id,
function (error, lines, rev, version, ranges) {
if (error != null) {
OError.tag(
error,
'error finding doc contents for getDocument',
{
doc_id,
project_id
}
)
return next(error)
}
if (plain) {
res.type('text/plain')
return res.send(lines.join('\n'))
} else {
const projectHistoryId = _.get(project, 'overleaf.history.id')
const projectHistoryType = _.get(
project,
'overleaf.history.display'
)
? 'project-history'
: undefined // for backwards compatibility, don't send anything if the project is still on track-changes
return res.json({
lines,
version,
ranges,
pathname: path.fileSystem,
projectHistoryId,
projectHistoryType
})
}
}
if (plain) {
res.type('text/plain')
return res.send(lines.join('\n'))
} else {
const projectHistoryId = _.get(project, 'overleaf.history.id')
const projectHistoryType = _.get(
project,
'overleaf.history.display'
)
? 'project-history'
: undefined // for backwards compatibility, don't send anything if the project is still on track-changes
return res.json({
lines,
version,
ranges,
pathname: path.fileSystem,
projectHistoryId,
projectHistoryType
})
}
})
)
}
)
}
@@ -96,7 +94,7 @@ module.exports = {
setDocument(req, res, next) {
if (next == null) {
next = function(error) {}
next = function (error) {}
}
const project_id = req.params.Project_id
const { doc_id } = req.params
@@ -109,7 +107,7 @@ module.exports = {
ranges,
lastUpdatedAt,
lastUpdatedBy,
function(error) {
function (error) {
if (error != null) {
OError.tag(error, 'error finding element for getDocument', {
doc_id,