Skip to content

Commit

Permalink
consolidating theme into one option
Browse files Browse the repository at this point in the history
  • Loading branch information
seiyria committed Nov 21, 2014
1 parent 2b58196 commit 44ca0e9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ build/Release
node_modules

# Users Environment Variables
.lock-wscript
.lock-wscript

themes/**/output.json
3 changes: 1 addition & 2 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -18,7 +17,7 @@ module.exports = (grunt) ->

watch:
dev:
files: ["themes/#{theme}-#{lib}/**/*", "doks/**/*"]
files: ["themes/#{theme}/**/*", "doks/**/*"]
tasks: ['build']
options:
livereload: yes
Expand Down
16 changes: 3 additions & 13 deletions lib/parser.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit 44ca0e9

Please sign in to comment.