Skip to content

Commit 56cfdcb

Browse files
authored
Merge pull request #56 from Livefyre/FYR-12434
FYR-12444: Updating jsdoc
2 parents 0d926fd + d0bbc24 commit 56cfdcb

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"inherits": "git://github.com/Livefyre/inherits.git",
1111
"jquery": "~1.10.1",
1212
"livefyre-bootstrap": "git://github.com/Livefyre/livefyre-bootstrap.git#1.5.7",
13-
"livefyre-theme-styler": "git://github.com/livefyre/livefyre-theme-styler.git#1.1.0",
13+
"livefyre-theme-styler": "git://github.com/livefyre/livefyre-theme-styler.git#1.4.1",
1414
"observer": "git://github.com/Livefyre/Observer.git#0.1.0",
1515
"pure-uuid": "1.5.2",
1616
"require-less": "git://github.com/gobengo/require-less.git#deponcss",
@@ -32,6 +32,7 @@
3232
"sinonjs": "1.17.1"
3333
},
3434
"resolutions": {
35+
"livefyre-theme-styler": "1.4.1",
3536
"livefyre-bootstrap": "1.5.7",
3637
"base64": "~0.4.0",
3738
"auth": "~0.4.2",

package.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"express": "4.0.0",
3232
"http-server": "*",
3333
"ink-docstrap": "git://github.com/michaelward82/docstrap.git#line-number-alignment",
34-
"jsdoc": "git://github.com/jsdoc3/jsdoc.git",
34+
"jsdoc": "3.6.3",
3535
"karma": "0.10.5",
3636
"karma-cajon": "*",
3737
"karma-chrome-launcher": "0.1.0",
@@ -53,7 +53,20 @@
5353
"rework": "git://github.com/gobengo/rework"
5454
},
5555
"lfeslint": {
56-
"ignore": ["lib/**", "tools/build.conf.js"],
57-
"global": ["requirejs", "Livefyre", "jasmine", "expect", "spyOn", "sandbox", "runs", "waitsFor", "define"]
56+
"ignore": [
57+
"lib/**",
58+
"tools/build.conf.js"
59+
],
60+
"global": [
61+
"requirejs",
62+
"Livefyre",
63+
"jasmine",
64+
"expect",
65+
"spyOn",
66+
"sandbox",
67+
"runs",
68+
"waitsFor",
69+
"define"
70+
]
5871
}
5972
}

0 commit comments

Comments
 (0)