Fixed up index view path alternative

previously was doing ../index, which was not intended now doing ../VIEW/index
pengyu · Mar 17, 2011 · 220d88d · 220d88d
1 parent a254e64
commit 220d88d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/view.js b/lib/view.js
@@ -272,7 +272,8 @@ res.render = function(view, opts, fn, parent, sub){
   // Try index ex: ./views/user/index.jade
   if (!view.exists) view = new View(orig.indexPath, options);
 
-  // Try ../name ../user from within ./user
+  // Try ../<name>/index ex: ../user/index.jade
+  // when calling partial('user') within the same dir
   if (!view.exists && !options.isLayout) view = new View(orig.upIndexPath, options);
 
   // Try layout relative to the "views" dir 

diff --git a/lib/view/view.js b/lib/view/view.js
@@ -47,6 +47,7 @@ var View = exports = module.exports = function View(view, options) {
   this.basename = basename(view);
   this.engine = this.resolveEngine();
   this.extension = '.' + this.engine;
+  this.name = this.basename.replace(this.extension, '');
   this.path = this.resolvePath();
   this.dirname = dirname(this.path);
 };
@@ -160,14 +161,14 @@ View.prototype.__defineGetter__('indexPath', function(){
 });
 
 /**
- * Return ../index path alternative.
+ * Return ../<name>/index path alternative.
  *
  * @return {String}
  * @api public
  */
 
 View.prototype.__defineGetter__('upIndexPath', function(){
-  return this.dirname + '/index' + this.extension;
+  return this.dirname + '/../' + this.name + '/index' + this.extension;
 });
 
 /**