Some fixes for template-rendering.

geddy · Nov 21, 2011 · 1b53f29 · 1b53f29
1 parent f7905e9
commit 1b53f29
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/lib/base_controller.js b/lib/base_controller.js
@@ -111,16 +111,12 @@ controller.BaseController = function () {
     has been sent to the client.
    */
   this.completed = false;
-  /*
   // The template root to look in for partials when rendering templates
   // Gets created programmatically based on controller name -- see renderTemplate
-  this.template = undefined;
-  // Should the layout be rendered
-  this.layout = true;
+  this.template = null;
   // The template layout directory to look in when rendering templates
   // Gets created programmatically based on controller name -- see renderTemplate
-  this.layoutpath = undefined;
-  */
+  this.layout = null;
 
 };
 
@@ -608,11 +604,9 @@ controller.BaseController.prototype = new (function () {
     this.template = this.template ||
     	'app/views/' + dirName + '/' + this.params.action;
 
-    if (this.layout) {
-	    // Calculate the layout if not set
-	    this.layoutpath = this.layoutpath ||
-	    	'app/views/layouts/' + dirName;
-    }
+    // Calculate the layout if not set
+    this.layout = this.layout ||
+      'app/views/layouts/' + dirName;
 
     var templater = new Templater();
     var content = '';
@@ -623,11 +617,11 @@ controller.BaseController.prototype = new (function () {
     });
 
     templater.addListener('end', function () {
-      _this.respond(content);
+      _this.respond(content, 'html');
     });
 
     templater.render(data, {
-      layout: this.layoutpath
+      layout: this.layout
     , template: this.template
     , controller: this.name
     , action: this.params.action

diff --git a/lib/template/adapters/ejs/index.js b/lib/template/adapters/ejs/index.js
@@ -38,8 +38,8 @@ Templater.prototype = new TemplaterBase();
 // Override the TempaterBase render method
 Templater.prototype.render = function (data, config) {
 
+  // Rendering a layout
   if (config.layout) {
-
     this.isLayout = true;
     this.templateRoot = getDirname(config.layout);
 
@@ -53,15 +53,19 @@ Templater.prototype.render = function (data, config) {
     });
 
     templaterContent.addListener('end', function () {
-      data.yield = function () { return contentPartial; };
+      // Define the `yield` method
+      data.yield = function () {
+        return contentPartial;
+      };
       _this.partial(getFilename(config.layout), data);
     });
 
     templaterContent.render(data, {template: config.template});
   }
 
+  // Rendering a regular template
   else {
-	 // Set the base path to look for template partials
+	 // Set the base path to look for partials called in this template
 	 this.templateRoot = getDirname(config.template);
 	 filename = getFilename(config.template);
    this.partial(filename, data);
@@ -89,9 +93,10 @@ var getTemplateUrl = function (templateRoot, partialUrl, parentNode, isLayout) {
   if (parentNode) {
     dirs.push(parentNode.dirname);
   }
-
-  // Or look in the specified templateRoot
+  // Also look in the specified templateRoot
   dirs.push(templateRoot);
+  // Also look in the base views dir
+  dirs.push('app/views');
 
   // Look through the directory list until you find a registered
   // template path -- these are registered during app init so we're
@@ -105,7 +110,7 @@ var getTemplateUrl = function (templateRoot, partialUrl, parentNode, isLayout) {
     }
   }
 
-  // No template
+  // No template found
   if (!templateUrl) {
     // If it's a layout, use the default one for the app
     if (isLayout) {