From 53788ef827e5bb482262d1d104cf4994f6b74be4 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Mon, 3 Aug 2015 11:00:47 +0200 Subject: [PATCH] revert "chore(doc-gen): render enum doctypes correctly" This reverts commit b8e82e4db31bd44eec4488f8b77366c78ba92a8e as it was breaking build on master. --- .../templates/enum.template.html | 1 - .../processors/readTypeScriptModules.js | 28 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 docs/angular.io-package/templates/enum.template.html diff --git a/docs/angular.io-package/templates/enum.template.html b/docs/angular.io-package/templates/enum.template.html deleted file mode 100644 index 9c59159b29..0000000000 --- a/docs/angular.io-package/templates/enum.template.html +++ /dev/null @@ -1 +0,0 @@ -{% extends 'class.template.html' -%} \ No newline at end of file diff --git a/docs/typescript-package/processors/readTypeScriptModules.js b/docs/typescript-package/processors/readTypeScriptModules.js index 4574cf83b1..cadb1d8fbf 100644 --- a/docs/typescript-package/processors/readTypeScriptModules.js +++ b/docs/typescript-package/processors/readTypeScriptModules.js @@ -63,11 +63,10 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo, var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker); log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id); - exportDoc.members = []; - // Generate docs for each of the export's members if (resolvedExport.flags & ts.SymbolFlags.HasMembers) { + exportDoc.members = []; for(var memberName in resolvedExport.members) { // FIXME(alexeagle): why do generic type params appear in members? if (memberName === 'T') { @@ -92,24 +91,21 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo, 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) { + exportDoc.members.sort(function(a, b) { + if (a.name > b.name) return 1; + if (a.name < b.name) return -1; + return 0; + }); } } - if (sortClassMembers) { - exportDoc.members.sort(function(a, b) { - if (a.name > b.name) return 1; - if (a.name < b.name) return -1; - 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