showDir as a parameter

jfhbrook · Nov 26, 2011 · d0f5120 · d0f5120
1 parent 7b5fd24
commit d0f5120
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/example/express.js b/example/express.js
@@ -2,8 +2,7 @@ var express = require('express');
 var ecstatic = require('../lib/ecstatic');
 
 var app = express.createServer();
-app.use(ecstatic(__dirname + '/public'));
-app.use(ecstatic.showDir(__dirname + '/public'));
+app.use(ecstatic(__dirname + '/public', { showDir : true }));
 app.listen(8080);
 
 console.log('Listening on :8080');
diff --git a/lib/ecstatic.js b/lib/ecstatic.js
@@ -11,7 +11,8 @@ var path = require('path'),
 
 var ecstatic = module.exports = function (dir, opts) {
   var root = path.resolve(dir) + '/',
-      cache = (opts && opts.cache) || 3600; // cache-ing time in seconds.
+      cache = (opts && opts.cache) || 3600, // cache-ing time in seconds.
+      shouldShowDir = (opts && opts.showDir);
 
   return function middleware (req, res, next) {
 
@@ -39,7 +40,7 @@ var ecstatic = module.exports = function (dir, opts) {
         status[500](res, next, { error: err });
       }
       else if (stat.isDirectory()) {
-        var handler = (typeof next === 'function')
+        var handler = (typeof next === 'function' && !shouldShowDir)
               ? next
               : function () {
                 showDir(file, pathname, stat, cache)(req, res);