ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Make locals override globals instead of the inverse

Browse Source
This commit is contained in:
Alice Gaudon 2021-05-13 17:39:20 +02:00
parent 13bd933b0b
commit c36e4c0fbe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/ViewEngine.ts
View File

@ -21,7 +21,7 @@ export default abstract class ViewEngine extends AssetPreCompiler {
public setup(app: Express, main: boolean): void { public setup(app: Express, main: boolean): void {
app.engine(this.extension, (path, options, callback) => { app.engine(this.extension, (path, options, callback) => {
// Props (locals) // Props (locals)
const locals = Object.assign(options, this.getGlobals().get()); const locals = Object.assign(this.getGlobals().get(), options);
this.render(path, locals) this.render(path, locals)
.then(value => callback(null, value)) .then(value => callback(null, value))