Comparing version 5.0.9 to 5.0.10
@@ -33,11 +33,11 @@ const mime = require('mime'); | ||
client.setTemplate = (file, data = {}) => state.set(this.TEMPLATE, (typeof file === 'string') | ||
? this.#getView(file, Object.assign(defaultViewData, data), state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
? this.#getView(file, { ...defaultViewData, ...data }, state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
: file); | ||
client.setLayout = (file, data = {}) => state.set(this.LAYOUT, (typeof file === 'string') | ||
? this.#getView(file, Object.assign(defaultViewData, data), state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
? this.#getView(file, { ...defaultViewData, ...data }, state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
: file); | ||
client.setErrorTemplate = (file, data = {}) => state.set(this.ERROR_TEMPLATE, (typeof file === 'string') | ||
? this.#getView(file, Object.assign(defaultViewData, data), state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
? this.#getView(file, { ...defaultViewData, ...data }, state.get(this.THEME_PATH), state.get(this.VIEW_CLASS)) | ||
: file); | ||
@@ -44,0 +44,0 @@ } |
@@ -138,3 +138,2 @@ /* | ||
const opt = option[name]; | ||
if (!opt) return; | ||
@@ -147,4 +146,4 @@ parents.push({ name, opt, key: k }); | ||
const instance = await this.parent(p.key); | ||
this[p.name] = instance; | ||
if (!instance) return; // parent can be null | ||
this[p.name] = instance; | ||
await instance.eagerLoad(p.opt); | ||
@@ -151,0 +150,0 @@ }), |
{ | ||
"name": "kohanajs", | ||
"version": "5.0.9", | ||
"version": "5.0.10", | ||
"description": "Node.js MVC framework base on PHP Kohana Framework", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
45426