From ccb9ae631728eeb3dfec5f4f9cadc5a02a8f4f4c Mon Sep 17 00:00:00 2001 From: Ersun Warncke Date: Thu, 3 Jan 2019 14:19:07 -0400 Subject: [PATCH] Merge pull request #1337 from sharelatex/mm-f1000-realrevisionurl Real revisionURL for F1000 exports GitOrigin-RevId: 6a9284c36680824fcc0be3b2f926deff27cb7cf8 --- .../web/app/coffee/infrastructure/ExpressLocals.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index 2a82b9ed34..71789a11b6 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -49,14 +49,14 @@ pathList = [ "/stylesheets/ol-ieee-style.css" ].concat(Modules.moduleAssetFiles(jsPath)) -if !Settings.useMinifiedJs +if !Settings.useMinifiedJs logger.log "not using minified JS, not hashing static files" else logger.log "Generating file hashes..." for path in pathList content = getFileContent(path) hash = crypto.createHash("md5").update(content).digest("hex") - + splitPath = path.split("/") filenameSplit = splitPath.pop().split(".") filenameSplit.splice(filenameSplit.length-1, 0, hash) @@ -145,7 +145,7 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)-> if opts.removeExtension == true path = path.slice(0,-3) - + if qs? and qs.length > 0 path = path + "?" + qs return path @@ -343,7 +343,7 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)-> webRouter.use (req, res, next) -> isOl = (Settings.brandPrefix == 'ol-') - res.locals.uiConfig = + res.locals.uiConfig = defaultResizerSizeOpen : if isOl then 7 else 24 defaultResizerSizeClosed : if isOl then 7 else 24 eastResizerCursor : if isOl then "ew-resize" else null @@ -372,4 +372,5 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)-> res.locals.ExposedSettings = isOverleaf: Settings.overleaf? appName: Settings.appName + siteUrl: Settings.siteUrl next()