Skip to content

Commit 349d7d1

Browse files
committed
Merge branch '0.1.x'
2 parents 0708038 + 8ff0b6a commit 349d7d1

File tree

4 files changed

+33
-21
lines changed

4 files changed

+33
-21
lines changed

lib/helpers.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ var hljs = require('highlight.js'),
22
markdown = require('markdown-it')({
33
html: true,
44
highlight: function (code) {
5+
56
return hljs.highlight('javascript', code).value;
7+
68
}
79
});
810

@@ -28,4 +30,14 @@ module.exports = function (hbs) {
2830

2931
});
3032

33+
hbs.registerHelper('replace', function (string, match, replacement) {
34+
35+
if (string) {
36+
37+
return string.replace(match, replacement);
38+
39+
}
40+
41+
});
42+
3143
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"handlebars": "3.0.1",
1313
"highlight.js": "8.5.0",
1414
"markdown-it": "4.1.0",
15-
"promise": "6.1.0",
15+
"promise": "7.0.0",
1616
"sqlite3": "3.0.5",
1717
"temp": "0.8.1"
1818
},
1919
"devDependencies": {
20-
"mocha": "2.2.1"
20+
"mocha": "2.2.4"
2121
},
2222
"scripts": {
2323
"test": "make test"

templates/markdown.hbs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{#if pkg.homepage}}
2-
#[{{title}}]({{pkg.homepage}}) {{#if pkg.version}}_{{pkg.version}}_{{/if}}
2+
# [{{title}}]({{pkg.homepage}}) {{#if pkg.version}}*{{pkg.version}}*{{/if}}
33
{{else}}
4-
#{{title}} {{#if pkg.version}}_{{pkg.version}}_{{/if}}
4+
# {{title}} {{#if pkg.version}}*{{pkg.version}}*{{/if}}
55
{{/if}}
66

77
{{#if description}}
@@ -10,35 +10,35 @@
1010

1111
{{#each files}}{{#each methods}}
1212

13-
##{{name}}({{params}}) {{#if isPrivate}} _private method_{{/if}}
13+
## {{name}}({{params}}) {{#if isPrivate}} *private method*{{/if}}
1414

1515
{{{description}}}
1616

1717
{{{body}}}
1818

1919
{{#if tags.param}}
2020

21-
###Parameters
21+
### Parameters
2222

2323
{{#each tags.param}}
24-
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
24+
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
2525
{{/each}}
2626

2727
{{/if}}
2828

2929
{{#if tags.property}}
3030

31-
###Properties
31+
### Properties
3232

3333
{{#each tags.property}}
34-
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
34+
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
3535
{{/each}}
3636

3737
{{/if}}
3838

3939
{{#if tags.example}}
4040

41-
###Examples
41+
### Examples
4242

4343
{{#each tags.example}}
4444
```javascript
@@ -48,12 +48,12 @@
4848

4949
{{/if}}
5050

51-
###Returns
51+
### Returns
5252

5353
{{#if tags.return}}
5454

5555
{{#each tags.return}}
56-
- {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
56+
- {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
5757
{{/each}}
5858

5959
{{else}}
@@ -64,4 +64,4 @@
6464

6565
{{/each}}{{/each}}
6666

67-
_Documentation generated with [doxdox](https://github.com/neogeek/doxdox)._
67+
*Documentation generated with [doxdox](https://github.com/neogeek/doxdox).*

templates/wiki/methods.hbs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
#{{name}}({{params}}) {{#if isPrivate}} _private method_{{/if}}
1+
# {{name}}({{params}}) {{#if isPrivate}} *private method*{{/if}}
22

33
{{{description}}}
44

55
{{{body}}}
66

77
{{#if tags.param}}
88

9-
##Parameters
9+
## Parameters
1010

1111
{{#each tags.param}}
12-
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
12+
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
1313
{{/each}}
1414

1515
{{/if}}
1616

1717
{{#if tags.property}}
1818

19-
##Properties
19+
## Properties
2020

2121
{{#each tags.property}}
22-
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
22+
- **{{name}}** {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
2323
{{/each}}
2424

2525
{{/if}}
2626

2727
{{#if tags.example}}
2828

29-
##Examples
29+
## Examples
3030

3131
{{#each tags.example}}
3232
```javascript
@@ -36,12 +36,12 @@
3636

3737
{{/if}}
3838

39-
##Returns
39+
## Returns
4040

4141
{{#if tags.return}}
4242

4343
{{#each tags.return}}
44-
- {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}_Optional_{{/if}} {{{description}}}
44+
- {{#each types}}`{{.}}` {{/each}} {{#if isOptional}}*Optional*{{/if}} {{{description}}}
4545
{{/each}}
4646

4747
{{else}}

0 commit comments

Comments
 (0)