Skip to content

Commit

Permalink
Merge branch 'egjs-jsdoc-migrate'
Browse files Browse the repository at this point in the history
from pull-request 61

* egjs-jsdoc-migrate:
  Fix (Gruntfile) : Fix jsdoc template name
  refactor (jsdoc) : Change jsdoc dependency from jaguar-jsdoc to egjs-jsdoc-template

Reviewed-by: 손찬욱 <[email protected]>
Reviewed-by: 김성철 <[email protected]>
  • Loading branch information
sculove committed May 15, 2015
2 parents 87a4d95 + 799dae7 commit c2eec19
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ module.exports = function(grunt) {
},
doc : {
files: [
{expand : true, flatten : true, src: ["assets/jsdoc-plugin/jsdoc/*.js"], dest: "node_modules/grunt-jsdoc/node_modules/jsdoc/plugins"},
{expand : true, flatten : true, src: ["assets/jsdoc-plugin/template/*.tmpl"], dest: "node_modules/jaguarjs-jsdoc/tmpl"},
{expand : true, flatten : true, src: ["assets/jsdoc-plugin/jaguarjs-jsdoc/*.*"], dest: "node_modules/jaguarjs-jsdoc/"},
{expand : true, flatten : true, src: ["assets/jsdoc-plugin/template/*.js"], dest: "node_modules/jaguarjs-jsdoc/static/scripts"},
{expand : true, flatten : true, src: ["assets/jsdoc-plugin/template/*.css"], dest: "node_modules/jaguarjs-jsdoc/static/styles"}
{expand : true, flatten : true, src: ["node_modules/egjs-jsdoc-template/jsdoc-plugin/*.*"], dest: "node_modules/grunt-jsdoc/node_modules/jsdoc/plugins"}
]
}
},
Expand Down Expand Up @@ -92,7 +88,7 @@ module.exports = function(grunt) {
src: ["src/**/*.js", "README.md"],
options: {
destination: "doc",
template : "node_modules/jaguarjs-jsdoc",
template : "node_modules/egjs-jsdoc-template",
configure : "jsdoc.json"
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"grunt-contrib-watch": "^0.6.1",
"grunt-jsdoc": "^0.5.8",
"grunt-qunit-istanbul": "^0.4.7",
"jaguarjs-jsdoc": "0.0.1",
"egjs-jsdoc-template": "git+http://ajaxpf:[email protected]/Front-End/egjs-jsdoc-template#master",
"jshint-stylish": "^1.0.1",
"load-grunt-tasks": "^3.1.0",
"time-grunt": "^1.1.0"
Expand Down

0 comments on commit c2eec19

Please sign in to comment.