From b64139650ca3a7a44d4998ab6401f8685b505a35 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Thu, 1 Mar 2018 20:19:23 +0000 Subject: [PATCH] build(aio): class API template once again extends export-base (#22534) PR Close #22534 --- .../templates/api/class.template.html | 40 ++++++++----------- .../templates/api/export-base.template.html | 2 +- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/aio/tools/transforms/templates/api/class.template.html b/aio/tools/transforms/templates/api/class.template.html index 60445b3372..175144103f 100644 --- a/aio/tools/transforms/templates/api/class.template.html +++ b/aio/tools/transforms/templates/api/class.template.html @@ -1,29 +1,23 @@ {% import "lib/memberHelpers.html" as memberHelpers -%} {% import "lib/descendants.html" as descendants -%} {% import "lib/paramList.html" as params -%} -{% extends 'base.template.html' -%} +{% extends 'export-base.template.html' -%} -{% block body %} -

{$ doc.shortDescription | marked $}

- {% include "includes/security-notes.html" %} - {% include "includes/deprecation.html" %} - {% block overview %} +{% block overview %} {% include "includes/class-overview.html" %} - {% endblock %} - {% block details %} - {% block additional %}{% endblock %} - {% include "includes/description.html" %} - {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $} - {$ memberHelpers.renderMethodDetails(doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $} - {% if doc.constructorDoc %} -

Constructor

- {$ memberHelpers.renderMethodDetail(doc.constructorDoc, 'constructor') $}{% endif %} - - {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $} - - {$ memberHelpers.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $} - - {% block annotations %}{% include "includes/annotations.html" %}{% endblock %} - {% endblock %} - {% include "includes/usageNotes.html" %} +{% endblock %} +{% block details %} + {% block additional %}{% endblock %} + {% include "includes/description.html" %} + {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static Properties') $} + {$ memberHelpers.renderMethodDetails(doc.staticMethods, 'static-methods', 'static-method', 'Static Methods') $} + {% if doc.constructorDoc %} +

Constructor

+ {$ memberHelpers.renderMethodDetail(doc.constructorDoc, 'constructor') $}{% endif %} + + {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $} + + {$ memberHelpers.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $} + + {% block annotations %}{% include "includes/annotations.html" %}{% endblock %} {% endblock %} diff --git a/aio/tools/transforms/templates/api/export-base.template.html b/aio/tools/transforms/templates/api/export-base.template.html index b2e24aa799..df5e0293fa 100644 --- a/aio/tools/transforms/templates/api/export-base.template.html +++ b/aio/tools/transforms/templates/api/export-base.template.html @@ -5,6 +5,6 @@ {% include "includes/security-notes.html" %} {% include "includes/deprecation.html" %} {% block overview %}{% endblock %} - {% include "includes/usageNotes.html" %} {% block details %}{% endblock %} + {% include "includes/usageNotes.html" %} {% endblock %}