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

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

Issue 162093002: fix imports link rel=stylesheet (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 10 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
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 7e62cc7adb575dde51b6aa40ddb53e58cb898176..8922e94f83e389c86ece758aac7c89036e6c285e 100644
--- a/pkg/polymer/lib/src/build/common.dart
+++ b/pkg/polymer/lib/src/build/common.dart
@@ -112,6 +112,14 @@ abstract class PolymerTransformer {
});
}
+ Future<String> readAsString(AssetId id, Transform transform) {
Siggi Cherem (dart-lang) 2014/02/13 00:08:18 is this method needed? seems that the first few va
Jennifer Messerly 2014/02/13 06:11:22 good catch. Out of curiosity, what is the `var ur
Siggi Cherem (dart-lang) 2014/02/13 17:46:33 It's basically for better error messages.
Jennifer Messerly 2014/02/13 20:43:45 Lovely explanation! Thank you :)
+ var primaryId = transform.primaryInput.id;
+ bool samePackage = id.package == primaryId.package;
+ var url = samePackage ? id.path
+ : assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true);
+ return transform.readInputAsString(id);
+ }
+
Future<bool> assetExists(AssetId id, Transform transform) =>
transform.getInput(id).then((_) => true).catchError((_) => false);
@@ -129,7 +137,8 @@ List<List<Transformer>> get phasesForPolymer =>
* urls are not resolved unless [source] is Dart file (has a .dart extension).
*/
// TODO(sigmund): delete once this is part of barback (dartbug.com/12610)
-AssetId resolve(AssetId source, String url, TransformLogger logger, Span span) {
+AssetId resolve(AssetId source, String url, TransformLogger logger, Span span,
+ {bool allowAbsolute: false}) {
if (url == null || url == '') return null;
var uri = Uri.parse(url);
var urlBuilder = path.url;
@@ -142,7 +151,9 @@ AssetId resolve(AssetId source, String url, TransformLogger logger, Span span) {
}
}
- logger.error('absolute paths not allowed: "$url"', span: span);
+ if (!allowAbsolute) {
+ logger.error('absolute paths not allowed: "$url"', span: span);
+ }
Siggi Cherem (dart-lang) 2014/02/13 00:08:18 we might want to resolve more precisely paths that
Jennifer Messerly 2014/02/13 06:11:22 yeah agree
return null;
}

Powered by Google App Engine
This is Rietveld 408576698