From 0cbd9d0ff97d8f860d0e065bdc3da0927f764b3e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 19 Jul 2016 11:41:36 +0100 Subject: [PATCH] use url.resolve to adding https:// part --- .../app/coffee/infrastructure/ExpressLocals.coffee | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index 0d47855221..09ababa54d 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -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()