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

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

Issue 424213004: Fix CSP mode of the polymer compiler. Turns out that inline Javascript <script> (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 5 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/import_inliner.dart
diff --git a/pkg/polymer/lib/src/build/import_inliner.dart b/pkg/polymer/lib/src/build/import_inliner.dart
index 675db2999d793603aebda86e8799a5b407a7ecd9..4f838399004d766a134d944fc4314fbacefe4637 100644
--- a/pkg/polymer/lib/src/build/import_inliner.dart
+++ b/pkg/polymer/lib/src/build/import_inliner.dart
@@ -226,21 +226,27 @@ class _HtmlInliner extends PolymerTransformer {
bool _extractScripts(Document doc, {bool injectLibraryName: true}) {
bool changed = false;
for (var script in doc.querySelectorAll('script')) {
- if (script.attributes['type'] != TYPE_DART) continue;
-
var src = script.attributes['src'];
if (src != null) continue;
+ var type = script.attributes['type'];
+ var isDart = type == TYPE_DART;
+
+ var shouldExtract = isDart ||
+ (options.contentSecurityPolicy && (type == null || type == TYPE_JS));
+ if (!shouldExtract) continue;
+
+ var extension = isDart ? 'dart' : 'js';
final filename = path.url.basename(docId.path);
final count = inlineScriptCounter++;
var code = script.text;
// TODO(sigmund): ensure this path is unique (dartbug.com/12618).
- script.attributes['src'] = src = '$filename.$count.dart';
+ script.attributes['src'] = src = '$filename.$count.$extension';
script.text = '';
changed = true;
- var newId = docId.addExtension('.$count.dart');
- if (injectLibraryName && !_hasLibraryDirective(code)) {
+ var newId = docId.addExtension('.$count.$extension');
+ if (isDart && injectLibraryName && !_hasLibraryDirective(code)) {
var libName = _libraryNameFor(docId, count);
code = "library $libName;\n$code";
}

Powered by Google App Engine
This is Rietveld 408576698