From df9403ed923b473738774f0882bc9df9f676d341 Mon Sep 17 00:00:00 2001 From: Jonathan Koren Date: Wed, 22 Jan 2020 09:55:54 -0800 Subject: [PATCH] Use template comment syntax for header & footer placeholders --- lib/src/html/templates.dart | 6 +++--- lib/templates/_footer.html | 5 +++-- lib/templates/_head.html | 3 ++- .../test_package_custom_templates/templates/_footer.html | 4 ++-- testing/test_package_custom_templates/templates/_head.html | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/src/html/templates.dart b/lib/src/html/templates.dart index 2b929c3f6d..f696adaa17 100644 --- a/lib/src/html/templates.dart +++ b/lib/src/html/templates.dart @@ -60,9 +60,9 @@ const _requiredTemplates = [ 'typedef.html', ]; -const String _headerPlaceholder = ''; -const String _footerPlaceholder = ''; -const String _footerTextPlaceholder = ''; +const String _headerPlaceholder = '{{! header placeholder }}'; +const String _footerPlaceholder = '{{! footer placeholder }}'; +const String _footerTextPlaceholder = '{{! footer-text placeholder }}'; Future> _loadPartials( _TemplatesLoader templatesLoader, diff --git a/lib/templates/_footer.html b/lib/templates/_footer.html index bac8322bab..d23b072dc0 100644 --- a/lib/templates/_footer.html +++ b/lib/templates/_footer.html @@ -8,7 +8,7 @@ {{/packageGraph.hasFooterVersion}} - + {{! footer-text placeholder }} {{! TODO(jdkoren): unwrap ^useBaseHref sections when the option is removed.}} @@ -17,7 +17,8 @@ - + +{{! footer placeholder }} diff --git a/lib/templates/_head.html b/lib/templates/_head.html index 3cfa7a3e67..44b8600764 100644 --- a/lib/templates/_head.html +++ b/lib/templates/_head.html @@ -26,7 +26,8 @@ - + + {{! header placeholder }} {{! We don't use , but we do lookup the htmlBase from javascript. }} diff --git a/testing/test_package_custom_templates/templates/_footer.html b/testing/test_package_custom_templates/templates/_footer.html index 23ef7259cd..c424ba4e2c 100644 --- a/testing/test_package_custom_templates/templates/_footer.html +++ b/testing/test_package_custom_templates/templates/_footer.html @@ -6,9 +6,9 @@ {{packageGraph.defaultPackage.name}} {{packageGraph.defaultPackage.version}}

- + {{! footer-text placeholder }} - +{{! footer placeholder }} diff --git a/testing/test_package_custom_templates/templates/_head.html b/testing/test_package_custom_templates/templates/_head.html index 4c6f1e8875..264cc9d32c 100644 --- a/testing/test_package_custom_templates/templates/_head.html +++ b/testing/test_package_custom_templates/templates/_head.html @@ -2,7 +2,7 @@ {{ title }} - + {{! header placeholder }}