Merge pull request #249 from jfbrennan/master

Provide default for defaultLayout

Author: sahat

README.md

@@ -95,7 +95,7 @@ var exphbs  = require('express-handlebars');
 
 var app = express();
 
-app.engine('handlebars', exphbs({defaultLayout: 'main'}));
+app.engine('handlebars', exphbs());
 app.set('view engine', 'handlebars');
 
 app.get('/', function (req, res) {
@@ -356,7 +356,7 @@ The string path to the directory where the partials templates reside or object w
 **Note:** Multiple partials dirs can be used by making `partialsDir` an array of strings, and/or config objects as described above. The namespacing feature is useful if multiple partials dirs are used and their file paths might clash.
 
 #### `defaultLayout`
-The string name or path of a template in the `layoutsDir` to use as the default layout. This is overridden by a `layout` specified in the app or response `locals`. **Note:** A falsy value will render without a layout; e.g., `res.render('home', {layout: false});`.
+The string name or path of a template in the `layoutsDir` to use as the default layout. `main` is used as the default. This is overridden by a `layout` specified in the app or response `locals`. **Note:** A falsy value will render without a layout; e.g., `res.render('home', {layout: false});`.
 
 #### `helpers`
 An object which holds the helper functions used when rendering templates with this `ExpressHandlebars` instance. When rendering a template, a collection of helpers will be generated by merging: `handlebars.helpers` (global), `helpers` (instance), and `options.helpers` (render-level). This allows Handlebars' `registerHelper()` function to operate as expected, will providing two extra levels over helper overrides.

examples/advanced/server.js

@@ -10,7 +10,6 @@ var app = express();
 
 // Create `ExpressHandlebars` instance with a default layout.
 var hbs = exphbs.create({
-    defaultLayout: 'main',
     helpers      : helpers,
 
     // Uses multiple partials dirs, templates in "shared/templates/" are shared

examples/basic/server.js

@@ -5,7 +5,7 @@ var express = require('express'),
 
 var app = express();
 
-app.engine('handlebars', exphbs({defaultLayout: 'main'}));
+app.engine('handlebars', exphbs());
 app.set('view engine', 'handlebars');
 
 app.get('/', function (req, res) {

lib/express-handlebars.js

@@ -26,7 +26,7 @@ function ExpressHandlebars(config) {
         extname        : '.handlebars',
         layoutsDir     : undefined, // Default layouts directory is relative to `express settings.view` + `layouts/`
         partialsDir    : undefined, // Default partials directory is relative to `express settings.view` + `partials/`
-        defaultLayout  : undefined,
+        defaultLayout  : 'main',
         helpers        : undefined,
         compilerOptions: undefined,
     }, config);