Chromium Code Reviews| Index: pkg/polymer/lib/src/transform/import_inliner.dart |
| diff --git a/pkg/polymer/lib/src/transform/import_inliner.dart b/pkg/polymer/lib/src/transform/import_inliner.dart |
| index 1f8fbf280e9ecd1bd68c176f0885458616ec4910..081c2ce3ab61f0590bedd607d568a032ed2712b6 100644 |
| --- a/pkg/polymer/lib/src/transform/import_inliner.dart |
| +++ b/pkg/polymer/lib/src/transform/import_inliner.dart |
| @@ -17,8 +17,8 @@ import 'common.dart'; |
| // TODO(sigmund): make sure we match semantics of html-imports for tags other |
| // than polymer-element (see dartbug.com/12613). |
| class ImportedElementInliner extends Transformer { |
| - /** Only run this transformer on .html files. */ |
| - final String allowedExtensions = ".html"; |
| + /** Only run on entrypoint .html files under web or test. */ |
|
Jennifer Messerly
2013/09/04 02:35:04
nit: space between entry and point
Siggi Cherem (dart-lang)
2013/09/04 16:30:16
Done.
|
| + Future<bool> isPrimary(Asset input) => isHtmlInWebOrTest(input.id); |
| Future apply(Transform transform) { |
| var seen = new Set<AssetId>(); |
| @@ -26,7 +26,8 @@ class ImportedElementInliner extends Transformer { |
| var id = transform.primaryInput.id; |
| seen.add(id); |
| return transform.primaryInput.readAsString().then((content) { |
| - var document = parseHtml(content, id.path, transform.logger); |
| + var document = parseHtml(content, id.path, transform.logger, |
| + checkDocType: true); |
| var future = _visitImports(document, id, transform, seen, elements); |
| return future.then((importsFound) { |
| if (!importsFound) { |
| @@ -83,8 +84,7 @@ class ImportedElementInliner extends Transformer { |
| Future _collectPolymerElements(AssetId id, Transform transform, |
| Set<AssetId> seen, List elements) { |
| return transform.readInputAsString(id).then((content) { |
| - var document = parseHtml( |
| - content, id.path, transform.logger, checkDocType: false); |
| + var document = parseHtml(content, id.path, transform.logger); |
|
Jennifer Messerly
2013/09/04 02:35:04
it's not a big deal but i'm not sure about flippin
Siggi Cherem (dart-lang)
2013/09/04 16:30:16
:) - good point, I flipped it back.
|
| return _visitImports(document, id, transform, seen, elements).then((_) { |
| var normalizer = new _UrlNormalizer(transform, id); |
| for (var element in document.queryAll('polymer-element')) { |