From 44ca0e92bc126181c835d5a6541d3af8c0337849 Mon Sep 17 00:00:00 2001
From: Kyle Kemp <kyle@seiyria.com>
Date: Fri, 21 Nov 2014 01:15:06 -0600
Subject: [PATCH] consolidating theme into one option

---
 .gitignore        |  4 +++-
 Gruntfile.coffee  |  3 +--
 lib/parser.coffee | 16 +++-------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 579eb39..49b7329 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,6 @@ build/Release
 node_modules
 
 # Users Environment Variables
-.lock-wscript
\ No newline at end of file
+.lock-wscript
+
+themes/**/output.json
\ No newline at end of file
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 00c5e7a..731c96b 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -3,7 +3,6 @@ module.exports = (grunt) ->
   require('load-grunt-tasks')(grunt)
 
   theme = grunt.option('theme') or 'bootstrap'
-  lib = grunt.option('lib') or 'angular'
 
   grunt.initConfig
     connect:
@@ -18,7 +17,7 @@ module.exports = (grunt) ->
 
     watch:
       dev:
-        files: ["themes/#{theme}-#{lib}/**/*", "doks/**/*"]
+        files: ["themes/#{theme}/**/*", "doks/**/*"]
         tasks: ['build']
         options:
           livereload: yes
diff --git a/lib/parser.coffee b/lib/parser.coffee
index afe7503..b487b5f 100644
--- a/lib/parser.coffee
+++ b/lib/parser.coffee
@@ -146,25 +146,15 @@ class Parser
     ###
     @options.glob ?= "**/*.#{@options.language}"
 
-    ###*
-      * This option determines which library to use when choosing a theme.
-      *
-      * @name lib
-      * @category Option
-      * @package TagParser
-      * @default {string} "angular"
-    ###
-    @options.lib ?= "angular"
-
     ###*
       * This option determines which UI framework to use when choosing a theme.
       *
       * @name theme
       * @category Option
       * @package TagParser
-      * @default {string} "bootstrap"
+      * @default {string} "bootstrap-angular"
     ###
-    @options.theme ?= "bootstrap"
+    @options.theme ?= "bootstrap-angular"
 
     ###*
       * This option lets the parser know what tags happen in multiples.
@@ -430,7 +420,7 @@ class Parser
     * @package TagParser
   ###
   copyTemplate: ->
-    ncp "./themes/#{@options.theme}-#{@options.lib}", @options.outputPath, =>
+    ncp "./themes/#{@options.theme}", @options.outputPath, =>
       fileContent = JSON.parse fs.readFileSync "#{@options.outputPath}/config.json",
         encoding: "UTF-8"