From 127082327d2ddd1c17b24624eb62ffe010d33f23 Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <ilya@burstcreations.com>
Date: Fri, 30 Oct 2015 22:34:24 -0400
Subject: [PATCH] Fix default theme resolve

---
 lib/output/html.js   | 12 ++++--------
 lib/resolve_theme.js |  8 ++++++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/output/html.js b/lib/output/html.js
index 27cfbe2c2..056acd077 100644
--- a/lib/output/html.js
+++ b/lib/output/html.js
@@ -2,9 +2,9 @@
 
 var File = require('vinyl'),
   vfs = require('vinyl-fs'),
+  extend = require('extend'),
   concat = require('concat-stream'),
   Handlebars = require('handlebars'),
-  extend = require('extend'),
   walk = require('../walk'),
   getTemplate = require('../get_template'),
   resolveTheme = require('../resolve_theme'),
@@ -47,16 +47,12 @@ function highlight(comment) {
  * @name html
  */
 module.exports = function makeHTML(comments, opts, callback) {
-
   comments = walk(comments, highlight);
 
-  var options = extend({}, {
-    theme: 'documentation-theme-default'
-  }, opts);
-
+  var options = extend({}, opts);
   var themeModule = resolveTheme(options.theme);
-
   var pageTemplate = getTemplate(Handlebars, themeModule, 'index.hbs');
+  
   Handlebars.registerPartial('section',
     getTemplate(Handlebars, themeModule, 'section.hbs'));
 
@@ -75,7 +71,7 @@ module.exports = function makeHTML(comments, opts, callback) {
         path: 'index.html',
         contents: new Buffer(pageTemplate({
           docs: comments,
-          options: opts
+          options: options
         }), 'utf8')
       })));
     }));
diff --git a/lib/resolve_theme.js b/lib/resolve_theme.js
index b8b5a6248..cd8dacec9 100644
--- a/lib/resolve_theme.js
+++ b/lib/resolve_theme.js
@@ -6,13 +6,17 @@ var path = require('path'),
 /**
  * Given the name of a theme as a module, return the directory it
  * resides in, or throw an error if it is not found
- * @param {string} theme the module name
+ * @param {string} [theme='documentation-theme-default'] the module name
  * @throws {Error} if theme is not found
  * @returns {string} directory
  */
 function resolveTheme(theme) {
+  var basedir = theme ? process.cwd() : __dirname;
+  
+  theme = theme || 'documentation-theme-default';
+
   try {
-    return path.dirname(resolve.sync(theme, { basedir: process.cwd() }));
+    return path.dirname(resolve.sync(theme, { basedir: basedir }));
   } catch (e) {
     throw new Error('Theme ' + theme + ' not found');
   }