hide source location if outputSourceFiles is false (#571)

revised fix to address the regression in #592
This commit is contained in:
Jeff Williams 2014-03-01 08:18:08 -08:00
parent 3caf49520d
commit 39daa9ab23
2 changed files with 8 additions and 4 deletions

View File

@ -468,21 +468,25 @@ exports.publish = function(taffyData, opts, tutorials) {
var members = helper.getMembers(data); var members = helper.getMembers(data);
members.tutorials = tutorials.children; members.tutorials = tutorials.children;
// output pretty-printed source files by default
var outputSourceFiles = conf['default'] && conf['default'].outputSourceFiles !== false ? true :
false;
// add template helpers // add template helpers
view.find = find; view.find = find;
view.linkto = linkto; view.linkto = linkto;
view.resolveAuthorLinks = resolveAuthorLinks; view.resolveAuthorLinks = resolveAuthorLinks;
view.tutoriallink = tutoriallink; view.tutoriallink = tutoriallink;
view.htmlsafe = htmlsafe; view.htmlsafe = htmlsafe;
view.outputSourceFiles = outputSourceFiles;
// once for all // once for all
view.nav = buildNav(members); view.nav = buildNav(members);
attachModuleSymbols( find({ kind: ['class', 'function'], longname: {left: 'module:'} }), attachModuleSymbols( find({ kind: ['class', 'function'], longname: {left: 'module:'} }),
members.modules ); members.modules );
// output pretty-printed source files by default; do this before generating any other pages, so // generate the pretty-printed source files first so other pages can link to them
// that the other pages can link to the source files if (outputSourceFiles) {
if (!conf['default'] || conf['default'].outputSourceFiles !== false) {
generateSourceFiles(sourceFiles, opts.encoding); generateSourceFiles(sourceFiles, opts.encoding);
} }

View File

@ -71,7 +71,7 @@ if (data.defaultvalue && data.defaultvaluetype === 'object') {
</ul></dd> </ul></dd>
<?js } ?> <?js } ?>
<?js if (data.meta) {?> <?js if (data.meta && self.outputSourceFiles) {?>
<dt class="tag-source">Source:</dt> <dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li> <dd class="tag-source"><ul class="dummy"><li>
<?js= self.linkto(meta.shortpath) ?>, <?js= self.linkto(meta.shortpath, 'line ' + meta.lineno, null, 'line' + meta.lineno) ?> <?js= self.linkto(meta.shortpath) ?>, <?js= self.linkto(meta.shortpath, 'line ' + meta.lineno, null, 'line' + meta.lineno) ?>