alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use url.resolve to adding https:// part

Browse Source
This commit is contained in:
Henry Oswald
2016-07-19 11:41:36 +01:00
parent a2a8b7123b
commit 0cbd9d0ff9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/infrastructure/ExpressLocals.coffee
+7 -4
View File
@@ -7,12 +7,12 @@ querystring = require('querystring')
SystemMessageManager = require("../Features/SystemMessages/SystemMessageManager")
_ = require("underscore")
Modules = require "./Modules"
url = require "url"
fingerprints = {}
Path = require 'path'
jsPath =
if Settings.useMinifiedJs
"/minjs/"
@@ -71,14 +71,17 @@ module.exports = (app, webRouter, apiRouter)->
res.locals.buildJsPath = (jsFile, fingerprint)->
if !fingerprint?
fingerprint = getFingerprint(jsPath + jsFile)
p = Path.join(staticFilesBase, jsPath, jsFile) + "?fingerprint=" + fingerprint
p = Path.join(jsPath, jsFile)
return url.resolve(staticFilesBase, p) + "?fingerprint=" + fingerprint
res.locals.buildCssPath = (cssFile)->
return Path.join(staticFilesBase, cssPath, cssFile) + "?fingerprint=" + getFingerprint(cssPath + cssFile)
p = Path.join(cssPath, cssFile)
return url.resolve(staticFilesBase, p) + "?fingerprint=" + getFingerprint(cssPath + cssFile)
res.locals.buildImgPath = (imgFile)->
return Path.join(staticFilesBase, imgPath, imgFile)
p = Path.join(imgPath, imgFile)
return url.resolve(staticFilesBase, p)
next()