archive-gh-me/jsdoc
1
0
Fork 0
mirror of https://github.com/jsdoc/jsdoc.git synced 2025-12-08 19:46:11 +00:00
Code Issues Projects Releases Wiki Activity

Rhino likes the filepaths (all args really) to be url encoded, which is an issue if spaces appear in filepaths. This makes JSDoc cooperate better with that rule.

Browse Source
This commit is contained in:
Michael Mathews 2012-07-08 01:07:49 +01:00
parent 4ac7f4b488
commit 51e1a785f8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jsdoc
View File

@ -10,7 +10,9 @@ URLPATH="file://"$BASEPATH
URLPATH=`echo "$URLPATH" | sed -e 's/ /%20/g'` URLPATH=`echo "$URLPATH" | sed -e 's/ /%20/g'`
ENCODEDBASEPATH=`echo "$BASEPATH" | sed -e 's/ /%20/g'` ENCODEDBASEPATH=`echo "$BASEPATH" | sed -e 's/ /%20/g'`
if test $1 = "--debug" ARGS="$@"
if test "$1" = "--debug"
then then
echo "Running Debug" echo "Running Debug"
CMD="org.mozilla.javascript.tools.debugger.Main -debug" CMD="org.mozilla.javascript.tools.debugger.Main -debug"
@ -20,12 +22,12 @@ else
fi fi
#Conditionally execute different command lines depending on whether we're running tests or not #Conditionally execute different command lines depending on whether we're running tests or not
if test $1 = "-T" if test "$1" = "-T"
then then
echo "Running Tests" echo "Running Tests"
java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $@ --dirname="${BASEPATH}/" java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/"
else else
# normal mode should be quiet # normal mode should be quiet
java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $@ --dirname="${BASEPATH}/" java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/"
fi fi

7
rhino_modules/jsdoc/src/scanner.js
View File

@ -36,11 +36,12 @@ exports.Scanner.prototype.scan = function(searchPaths, depth, filter) {
depth = depth || 1; depth = depth || 1;
searchPaths.forEach(function($) { searchPaths.forEach(function($) {
if ( fs.stat($).isFile() ) { var filepath = decodeURIComponent($);
filePaths.push($); if ( fs.stat(filepath).isFile() ) {
filePaths.push(filepath);
} }
else { else {
filePaths = filePaths.concat(fs.ls($, depth)); filePaths = filePaths.concat(fs.ls(filepath, depth));
} }
}); });