Fixed _ prefix object resolution on partials (resolveObjectName), add…

…ed _ prefix fallback to view file resolution (prefixPath)
smh · Dec 22, 2010 · 1c2e9a4 · 1c2e9a4
1 parent 5d87133
commit 1c2e9a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/express/view.js b/lib/express/view.js
@@ -198,13 +198,20 @@ http.ServerResponse.prototype.render = function(view, options, fn, parent){
     ? new Partial(view, options)
     : new View(view, options);
 
-  // Ensure view exists, otherwise try index
+  // Ensure view exists, otherwise try _ prefix
+  if (!view.exists) {
+    view = partial
+      ? new Partial(view.prefixPath, options)
+      : new View(view.prefixPath, options);
+  }
+
+  // Ensure view _ prefix exists, otherwise try index
   if (!view.exists) {
     view = partial
       ? new Partial(view.indexPath, options)
       : new View(view.indexPath, options);
   }
-
+  
   // Dynamic helper support
   if (false !== options.dynamicHelpers) {
     // cache

diff --git a/lib/express/view/partial.js b/lib/express/view/partial.js
@@ -56,6 +56,7 @@ exports.resolveObjectName = function(view){
     .split('/')
     .slice(-1)[0]
     .split('.')[0]
+    .replace(/^_/, '')
     .replace(/[^a-zA-Z0-9 ]+/g, ' ')
     .split(/ +/).map(function(word, i){
       return i

diff --git a/lib/express/view/view.js b/lib/express/view/view.js
@@ -147,6 +147,17 @@ View.prototype.__defineGetter__('indexPath', function(){
     + '/index' + this.extension;
 });
 
+/**
+ * Return _ prefix path alternative
+ *
+ * @return {String}
+ * @api public
+ */
+
+View.prototype.__defineGetter__('prefixPath', function(){
+  return this.dirname + '/_' + this.basename;
+});
+
 /**
  * Register the given template engine `exports`
  * as `ext`. For example we may wish to map ".html"