Skip to content

Commit 5f02943

Browse files
committed
Merge branch '0.1.x'
2 parents 62736b6 + 65202fd commit 5f02943

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"dependencies": {
99
"adm-zip": "0.4.7",
1010
"chalk": "1.0.0",
11-
"dox": "0.7.1",
12-
"handlebars": "3.0.1",
13-
"highlight.js": "8.5.0",
14-
"markdown-it": "4.1.0",
15-
"promise": "7.0.0",
16-
"sqlite3": "3.0.5",
11+
"dox": "0.8.0",
12+
"handlebars": "3.0.3",
13+
"highlight.js": "8.6.0",
14+
"markdown-it": "4.2.1",
15+
"promise": "7.0.1",
16+
"sqlite3": "3.0.8",
1717
"temp": "0.8.1"
1818
},
1919
"devDependencies": {
20-
"mocha": "2.2.4"
20+
"mocha": "2.2.5"
2121
},
2222
"scripts": {
2323
"test": "make test"

templates/bootstrap.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ pre .hljs {
115115
116116
var protocol = w.location.protocol === 'file:' ? 'http:' : w.location.protocol,
117117
resource = [
118-
'//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css',
119-
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/github.min.css',
120-
'//code.jquery.com/jquery-2.1.3.js',
121-
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js'
118+
'//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css',
119+
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css',
120+
'//code.jquery.com/jquery-2.1.4.js',
121+
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js'
122122
];
123123
124124
function loadResource(url) {

templates/dash/resources/bootstrap/bootstrap.min.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/dash/resources/highlight.js/github.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/fixtures/dox.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"isPrivate": false,
55
"type": "method",
66
"name": "exports.escape",
7-
"description": "Escape the given `html`.\n",
7+
"description": "Escape the given `html`.",
88
"body": "",
99
"tags": {
1010
"example": [
11-
" utils.escape('<script></script>')\n // => '&lt;script&gt;&lt;/script&gt;'\n"
11+
" utils.escape('<script></script>')\n // => '&lt;script&gt;&lt;/script&gt;'"
1212
],
1313
"param": [
1414
{

test/fixtures/facade.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "method",
66
"name": "Facade.Polygon",
77
"description": "Create a polygon object. Inherits all methods from <b>Facade.Entity</b>.",
8-
"body": "```\nvar polygon = new Facade.Polygon({\n x: 0,\n y: 0,\n points: [ [100, 0], [200, 100], [100, 200], [0, 100] ],\n lineWidth: 10,\n strokeStyle: '#333E4B',\n fillStyle: '#1C73A8',\n anchor: 'top/left'\n});\n```\n",
8+
"body": "```\nvar polygon = new Facade.Polygon({\n x: 0,\n y: 0,\n points: [ [100, 0], [200, 100], [100, 200], [0, 100] ],\n lineWidth: 10,\n strokeStyle: '#333E4B',\n fillStyle: '#1C73A8',\n anchor: 'top/left'\n});\n```",
99
"tags": {
1010
"example": [],
1111
"param": [
@@ -139,7 +139,7 @@
139139
"isPrivate": true,
140140
"type": "method",
141141
"name": "Facade.Polygon._defaultOptions",
142-
"description": "Returns a default set of options common to all Facade.js polygon entities.\n",
142+
"description": "Returns a default set of options common to all Facade.js polygon entities.",
143143
"body": "",
144144
"tags": {
145145
"example": [
@@ -172,7 +172,7 @@
172172
"isPrivate": true,
173173
"type": "method",
174174
"name": "Facade.Polygon._draw",
175-
"description": "Renders a polygon entity to a canvas.\n",
175+
"description": "Renders a polygon entity to a canvas.",
176176
"body": "",
177177
"tags": {
178178
"example": [

0 commit comments

Comments
 (0)