Skip to content

Added support for the standard global layout option #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aggtaa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for the standard global layout option #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions express-dot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ exports.__express = function(filename, options, cb) {
cb = (typeof cb === 'function') ? cb : function() {};
var extension = path.extname(filename);

if (options.layout !== undefined && !options.layout) return _renderFile(filename, options, cb);
var layout = options.layout || (options.settings['view options'] && options.settings['view options'].layout);
if (layout !== undefined && !layout) return _renderFile(filename, options, cb);

var viewDir = options.settings.views;
var layoutFileName = path.join(viewDir, options.layout || 'layout' + extension);
var layoutFileName = path.join(viewDir, layout || 'layout' + extension);

var layoutTemplate = _cache[layoutFileName];
if (layoutTemplate) return _renderWithLayout(filename, layoutTemplate, options, cb);
Expand Down