update submodule; prevents errors when type expressions contain newlines (#366)

This commit is contained in:
Jeff Williams 2013-03-20 21:02:02 -07:00
parent 8d6f746091
commit cf89e494ec
4 changed files with 14 additions and 10 deletions

View File

@ -18,7 +18,7 @@
], ],
"dependencies": { "dependencies": {
"async": "0.1.22", "async": "0.1.22",
"catharsis": "0.5.0", "catharsis": "0.5.1",
"crypto-browserify": "git://github.com/dominictarr/crypto-browserify.git#95c5d505", "crypto-browserify": "git://github.com/dominictarr/crypto-browserify.git#95c5d505",
"github-flavored-markdown": "git://github.com/hegemonic/github-flavored-markdown.git", "github-flavored-markdown": "git://github.com/hegemonic/github-flavored-markdown.git",
"js2xmlparser": "0.1.0", "js2xmlparser": "0.1.0",

View File

@ -1,5 +1,5 @@
/** /**
* catharsis 0.4.2 * Catharsis
* A parser for Google Closure Compiler type expressions, powered by PEG.js. * A parser for Google Closure Compiler type expressions, powered by PEG.js.
* *
* @author Jeff Williams <jeffrey.l.williams@gmail.com> * @author Jeff Williams <jeffrey.l.williams@gmail.com>
@ -101,6 +101,10 @@ function Catharsis() {
Catharsis.prototype.parse = function(typeExpr, options) { Catharsis.prototype.parse = function(typeExpr, options) {
options = options || {}; options = options || {};
typeExpr = typeExpr.replace(/[\r\n]/g, '')
.replace(/\s+/g, ' ')
.trim();
return cachedParse(typeExpr, options); return cachedParse(typeExpr, options);
}; };

12
node_modules/catharsis/package.json generated vendored

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
{ {
"name": "jsdoc", "name": "jsdoc",
"version": "3.2.0-dev", "version": "3.2.0-dev",
"revision": "1363617959876", "revision": "1363838424893",
"description": "An API documentation generator for JavaScript.", "description": "An API documentation generator for JavaScript.",
"keywords": [ "documentation", "javascript" ], "keywords": [ "documentation", "javascript" ],
"licenses": [ "licenses": [
@ -18,7 +18,7 @@
], ],
"dependencies": { "dependencies": {
"async": "0.1.22", "async": "0.1.22",
"catharsis": "0.5.0", "catharsis": "0.5.1",
"crypto-browserify": "git://github.com/dominictarr/crypto-browserify.git#95c5d505", "crypto-browserify": "git://github.com/dominictarr/crypto-browserify.git#95c5d505",
"github-flavored-markdown": "git://github.com/hegemonic/github-flavored-markdown.git", "github-flavored-markdown": "git://github.com/hegemonic/github-flavored-markdown.git",
"js2xmlparser": "0.1.0", "js2xmlparser": "0.1.0",