Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: pkg/polymer/lib/src/build/common.dart

Issue 28053008: Transformer plugin for polymer. This will make it possible (one day) to use (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/polymer/lib/deploy.dart ('k') | pkg/polymer/lib/transformer.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/polymer/lib/src/build/common.dart
diff --git a/pkg/polymer/lib/src/build/common.dart b/pkg/polymer/lib/src/build/common.dart
index fc2acf5ab0164f4a08f4a01c72274f1bd8a9fad9..1ae2a90de1f376984d7741c26ff5cec0b26b6046 100644
--- a/pkg/polymer/lib/src/build/common.dart
+++ b/pkg/polymer/lib/src/build/common.dart
@@ -36,10 +36,9 @@ Document _parseHtml(String contents, String sourcePath, TransformLogger logger,
/** Additional options used by polymer transformers */
class TransformOptions {
- String currentPackage;
List<String> entryPoints;
- TransformOptions([this.currentPackage, entryPoints])
+ TransformOptions([entryPoints])
: entryPoints = entryPoints == null ? null
: entryPoints.map(_systemToAssetPath).toList();
@@ -48,11 +47,11 @@ class TransformOptions {
if (id.extension != '.html') return false;
// Note: [id.path] is a relative path from the root of a package.
- if (currentPackage == null || entryPoints == null) {
+ if (entryPoints == null) {
return id.path.startsWith('web/') || id.path.startsWith('test/');
}
- return id.package == currentPackage && entryPoints.contains(id.path);
+ return entryPoints.contains(id.path);
}
}
@@ -71,11 +70,12 @@ abstract class PolymerTransformer {
Future<Document> readAsHtml(AssetId id, Transform transform) {
var primaryId = transform.primaryInput.id;
- var url = (id.package == primaryId.package) ? id.path
+ bool samePackage = id.package == primaryId.package;
+ var url = samePackage ? id.path
: assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true);
return transform.readInputAsString(id).then((content) {
return _parseHtml(content, url, transform.logger,
- checkDocType: options.isHtmlEntryPoint(id));
+ checkDocType: samePackage && options.isHtmlEntryPoint(id));
});
}
« no previous file with comments | « pkg/polymer/lib/deploy.dart ('k') | pkg/polymer/lib/transformer.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698