Skip to content

Commit

Permalink
docco plugin rework
Browse files Browse the repository at this point in the history
  • Loading branch information
shcarrico committed Apr 7, 2014
1 parent a1cc1d4 commit bc6f34f
Show file tree
Hide file tree
Showing 15 changed files with 554 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ docs*
*.DS_Store
.idea
bower_components/
test/pluginified/latest.js
test/pluginified/latest.js
docco
25 changes: 16 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,22 @@ module.exports = function (grunt) {
}
},
docco: {
dev: {
src: [
'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
'!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js','!**/*_test.js'
options: {
dst: 'docco/',
layout : 'parallel',
css : 'resources/docco.css'
},
docs: {
files : [
{
src : [
'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
'!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js','!**/*_test.js'
],
expand : true
}
],
options: {
output: 'docco/'
}
}
},
plato: {
Expand Down Expand Up @@ -450,7 +457,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('bitovi-tools');
grunt.loadNpmTasks('grunt-jsbeautifier');
grunt.loadNpmTasks('grunt-docco');
grunt.loadNpmTasks('grunt-docco2');
grunt.loadNpmTasks('grunt-plato');

grunt.registerTask('quality', [ 'jsbeautifier', 'jshint']);
Expand Down
2 changes: 1 addition & 1 deletion component/component.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@test can/component/test.html
@parent canjs
@release 2.0
@link ../docco/component.html docco
@link ../docco/component/component.html docco


@description Create widgets that use a template, a view-model
Expand Down
2 changes: 1 addition & 1 deletion compute/compute.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@function can.compute
@parent canjs
@release 1.1
@link ../docco/compute.html docco
@link ../docco/compute/compute.html docco

@description Create an observable value.

Expand Down
2 changes: 1 addition & 1 deletion construct/construct.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@test can/construct/test.html
@parent canjs
@group can.Construct.plugins plugins
@link ../docco/construct.html docco
@link ../docco/construct/construct.html docco

@description

Expand Down
2 changes: 1 addition & 1 deletion control/control.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@inherits can.Construct
@description widget factory with declarative event binding.
@group can.Control.plugins plugins
@link ../docco/control.html docco
@link ../docco/control/control.html docco

@description Create organized, memory-leak free, rapidly performing,
stateful controls with declarative event binding. Use `can.Control` to create UI
Expand Down
2 changes: 1 addition & 1 deletion list/doc/list.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@group can.List.static 1 Static
@group can.List.plugins 2 plugins

@link ../docco/list.html docco
@link ../docco/list/list.html docco

Use for observable array-like objects.

Expand Down
2 changes: 1 addition & 1 deletion map/doc/map.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@test can/map/test.html
@plugin can/map
@release 2.0
@link ../docco/map.html docco
@link ../docco/map/map.html docco

@description Create observable objects.

Expand Down
2 changes: 1 addition & 1 deletion model/model.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@parent canjs
@download can/model
@test can/model/test.html
@link ../docco/model.html docco
@link ../docco/model/model.html docco

@signature `can.Model([name,] staticProperties, instanceProperties)`
Create a can.Model constructor. (See [can.Construct] for more details on this syntax.)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"bower": "~1.2.7",
"grunt-contrib-jshint": "~0.8.0",
"grunt-jsbeautifier": "~0.2.6",
"grunt-docco": "~0.3.2",
"grunt-docco2": "git://github.com/shcarrico/grunt-docco.git#e4de54886ed5c421b2e26e7a2aeba1f73e889733",
"grunt-plato": "~0.2.1"
},
"scripts": {
Expand Down
Loading

0 comments on commit bc6f34f

Please sign in to comment.