cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert "chore(doc-gen): render enum doctypes correctly"

Browse Source 
This reverts commit b8e82e4db31bd44eec4488f8b77366c78ba92a8e
as it was breaking build on master.
This commit is contained in:
Pawel Kozlowski 2015-08-03 11:00:47 +02:00
parent b8e82e4db3
commit 53788ef827
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/angular.io-package/templates/enum.template.html
View File

@ -1 +0,0 @@
{% extends 'class.template.html' -%}

22
docs/typescript-package/processors/readTypeScriptModules.js
View File

@ -63,11 +63,10 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker); var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker);
log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id); log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id);
exportDoc.members = [];
// Generate docs for each of the export's members // Generate docs for each of the export's members
if (resolvedExport.flags & ts.SymbolFlags.HasMembers) { if (resolvedExport.flags & ts.SymbolFlags.HasMembers) {
exportDoc.members = [];
for(var memberName in resolvedExport.members) { for(var memberName in resolvedExport.members) {
// FIXME(alexeagle): why do generic type params appear in members? // FIXME(alexeagle): why do generic type params appear in members?
if (memberName === 'T') { if (memberName === 'T') {
@ -92,17 +91,6 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
exportDoc.newMember = memberDoc; exportDoc.newMember = memberDoc;
} }
} }
}
if (exportDoc.docType === 'enum') {
for(var memberName in resolvedExport.exports) {
log.silly('>>>>>> member: ' + memberName + ' from ' + exportDoc.id + ' in ' + moduleDoc.id);
var memberSymbol = resolvedExport.exports[memberName];
var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
docs.push(memberDoc);
exportDoc.members.push(memberDoc);
}
}
if (sortClassMembers) { if (sortClassMembers) {
exportDoc.members.sort(function(a, b) { exportDoc.members.sort(function(a, b) {
@ -111,6 +99,14 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
return 0; return 0;
}); });
} }
}
if (exportDoc.docType == 'enum') {
exportDoc.members = [];
for (var etype in resolvedExport.exports) {
exportDoc.members.push(etype);
}
}
// Add this export doc to its module doc // Add this export doc to its module doc
moduleDoc.exports.push(exportDoc); moduleDoc.exports.push(exportDoc);