1098 Commits

Author SHA1 Message Date
Jeff Williams
c1c15e8156 Merge branch 'master' into timers 2012-10-07 07:41:14 -07:00
Jeff Williams
e17601feb1 remove Envjs from test harness; remove broken --coffee option; add --nocolor option 2012-10-07 07:39:47 -07:00
Jeff Williams
10a54620fc use consistent path separators on windows (#207) 2012-10-04 09:20:44 -07:00
Jeff Williams
cdee70fe4c correct docs 2012-10-03 08:18:26 -07:00
Jeff Williams
914d2409c6 add native timeout/interval functions 2012-10-03 08:18:01 -07:00
Michael Mathews
570a585f4e Fix bug that caused failing tests when no conf.json file is present. Closes #206 2012-10-01 17:42:48 +01:00
Jeff Williams
46959b53a1 use Java's File/URI classes to convert between paths and URIs (#203) 2012-09-29 21:07:58 -07:00
Jeff Williams
0fdcdd0794 preserve exception message when publish.js can't be loaded 2012-09-29 20:25:28 -07:00
Jeff Williams
d2ffcb9563 don't blow up on windows when we require() publish.js (#200) 2012-09-27 08:32:40 -07:00
Jeff Williams
9ae503e6ed improve function name 2012-09-24 08:55:23 -07:00
Jeff Williams
b9ed72118c whitespace 2012-09-24 07:55:44 -07:00
Jeff Williams
e2ed15141c clarify comment 2012-09-24 06:53:33 -07:00
Jeff Williams
716adbabf3 fix error in exceptions template (#199) 2012-09-23 21:15:46 -07:00
Jeff Williams
ec47356ee6 make templates work from relative and absolute paths (#196, #197, #198) 2012-09-23 21:06:36 -07:00
Jeff Williams
add0b09638 don't show "type" section if there are no types to display (#195) 2012-09-22 11:22:01 -07:00
Jeff Williams
c890b0cf79 replace SHJS syntax highlighter with prettify.js (#193) 2012-09-21 14:17:12 -07:00
Jeff Williams
c20f399d1d show type of events; link to type of return values (#192) 2012-09-21 11:11:47 -07:00
Jeff Williams
0a199914a1 replace more syntax that makes the dash shell cranky (#187) 2012-09-21 09:14:47 -07:00
Jeff Williams
9f8f7bfba8 Replace syntax that makes the dash shell cranky (#184)
Thanks to http://www.dartmouth.edu/~rc/classes/ksh/flow-control-ex.html
for this monstrosity.
2012-09-21 08:19:09 -07:00
Jeff Williams
48cd77e77c remove unused variable 2012-09-20 16:00:55 -07:00
Michael Mathews
3bdd67e737 Merge pull request #191 from steidinger/template-overwrites-css-files
Proposed fix for Issue #190 (default template truncates CSS files on Windows)
2012-09-20 14:49:47 -07:00
Jeff Williams
e7b28b6dc2 move detectVm() so it isn't global 2012-09-20 08:50:18 -07:00
Jeff Williams
6b95d8b29d replace broken tag in tutorial template (#188) 2012-09-20 08:06:34 -07:00
Frank Steidinger
132a6da310 Prevent default template from trying to copy its static files into themselves if env.dirname contains a backslash. Otherwise they end up empty.
Filenames provided by fs.ls already use slashes instead of backslashes so the replace(fromDir, toDir) does nothing and the file is truncated. (Issue #190)
2012-09-20 12:35:27 +02:00
Michael Mathews
20f8709463 Fix for property tag being malformed. 2012-09-20 01:21:13 +01:00
Jeff Williams
3463a472a6 add FunctionNode reference to parser 2012-09-18 22:31:39 -07:00
Jeff Williams
bf84d3cd1d say that comments must have leading asterisks when using Markdown (#177) 2012-09-17 21:59:47 -07:00
Jeff Williams
4e0af2967a refactor default template and templateHelper.js (#186) 2012-09-17 21:50:26 -07:00
Jeff Williams
f1a104eb06 add helper function for debugging parse events 2012-09-16 11:37:56 -07:00
Jeff Williams
da485dff2c Merge pull request #182 from BobKerns/mingw
Make jsdoc script work with MinGW and Cygwin
2012-09-12 07:12:01 -07:00
Jeff Williams
6df6fafaf2 Merge pull request #183 from BobKerns/path-fix
Use the java facilities to handle path manipulations portably.
2012-09-12 07:04:50 -07:00
Bob Kerns
dc2ec62e70 Use the java facilities to handle path manipulations portably.
This was causing it to mis-calculate the paths, and end up losing the
output directory entirely, and overwrite the template static files
with themselves, resulting in truncation to zero-length. Of course,
they were also missing in the output.

It was expecting to be able to split paths on
System.getProperty("path.separator"), but that describes how to put a
path together, not how to take one apart, which is more complicated.

In particular, in windows, / is as valid a separator as \ in all but a
few UI contexts.

And since we need to pass / in paths that may get turned into URI's,
it's important to handle this correctly.

Java already provides a File facility to handle these sorts of operations.
This patch makes use of java.io.File to:

1) Find the parent of a File for dirname.
2) Find the name of a File for basename.

It also now makes use of substring for removing the ext for basename,
rather than Array.prototype.slice + join(""). I'm not sure what that
was all about...  It does have the effect of ensuring it's a Javascript
String, but calling String() has the same benefit and is much more clear.

You can put that back if there was a reason for it, but it looks just
confused to me.
2012-09-11 22:57:50 -07:00
Bob Kerns
3bf586ab5f Make the tests work under Cygwin
Under Cygwin, we need to be a bit more aggressive with replacing \ with /
to avoid \ in URIs internally. This shows up when running the tests with -T,
but not when running files directly, for reasons I don't fully understand.

This patch replaces the previous replacement of \ => / with one that happens
earlier and applies to all references, not just the URIs we construct.

Cygwin now passes jsdoc -T from any directory.
2012-09-11 19:38:50 -07:00
Bob Kerns
c3f8dab0d5 Make the tests work when run from other directories. 2012-09-11 19:35:12 -07:00
Bob Kerns
d8d61ee2d6 Make jsdoc script work with MinGW and Cygwin
On MinGW and Cygwin, we have different representations for pathnames,
neither of which Rhino understands. We also have to contend with '\',
which is not a legal URI character.

And we have to supply a third / after file:// (two before the null
hostname, and one before the start of the absolute path). Since Windows
paths don't start with /, we have to supply it in that case.

We handle the MinGW and Cygwin cases by asking for the information with
'pwd -W' for MinGW and 'cygpath $(pwd)' for Cygwin, before finally
falling back to pwd for everyone else. Then, if they don't start with '/'
we supply the extra '/' for the URL.
2012-09-11 18:54:47 -07:00
Jeff Williams
735bbd9182 make the tests pass again. note to self: run tests, THEN commit… 2012-09-09 21:15:58 -07:00
Jeff Williams
c8ce159342 use 'defaultvalue' property, not 'default', to hold the default value (closes #180) 2012-09-09 21:12:35 -07:00
Jeff Williams
e9a9dc988e if a child overrides an ancestor member, don't document the ancestor member (closes #158) 2012-09-09 20:06:49 -07:00
Jeff Williams
b3c717b8cb don't throw an exception if a parameter has no name (closes #175) 2012-09-09 13:44:19 -07:00
Jeff Williams
bf2fd75c3f use 'inherited' property in default template (closes #154) 2012-09-09 08:29:47 -07:00
Jeff Williams
09c77558d5 Merge pull request #178 from hegemonic/type-refactor
Refactor type parsing. Closes #118.
2012-09-09 08:01:56 -07:00
Jeff Williams
d6fedc82aa put the optional/nullable/variable/default properties in the right place 2012-09-09 07:58:27 -07:00
Jeff Williams
8622efd2ba Merge remote-tracking branch 'upstream/master' into type-refactor 2012-09-09 07:41:41 -07:00
Jeff Williams
e59dc9023a tests for doclets with Markdown asterisks 2012-09-09 07:18:13 -07:00
Jeff Williams
7c0d72415d Merge branch 'master' of git://github.com/DataTables/jsdoc into DataTables-master 2012-09-08 18:16:44 -07:00
Jeff Williams
d22d59b315 improve error message when "-d console" isn't used (closes #174); JSHint cleanup 2012-09-08 18:15:20 -07:00
Jeff Williams
7675640537 improve error message when template is missing (closes #171), plus minor cleanup 2012-09-08 18:00:16 -07:00
Jeff Williams
f5e3f0f31d save output in the current working directory, not the JSDoc directory 2012-09-03 10:23:25 -07:00
Allan Jardine
358dceac2c Fix jsdoc issue #172: Remove second call to unwrap. 2012-09-03 10:23:55 +01:00
Jeff Williams
ef6f2e92d5 use arrays instead of objects in Haruki template. fixes #153. (thanks to @kpozin for the fix!) 2012-08-22 20:07:33 -07:00