Revision: 199
Author:
fla...@chromium.org
Date: Thu Oct 1 17:54:43 2015 UTC
Log: Ignore Polymer bound src="[[attr]]" from grit processing.
BUG=chromium:526577
Review URL:
https://codereview.chromium.org/1374383003/
Patch from Dan Beam <
db...@chromium.org>.
https://code.google.com/p/grit-i18n/source/detail?r=199
Modified:
/trunk/grit/format/html_inline.py
/trunk/grit/format/html_inline_unittest.py
=======================================
--- /trunk/grit/format/html_inline.py Mon Mar 30 21:25:12 2015 UTC
+++ /trunk/grit/format/html_inline.py Thu Oct 1 17:54:43 2015 UTC
@@ -46,7 +46,7 @@
'<include[^>]+?src="(?P<filename>[^"\']*)".*?>(\s*</include>)?',
re.DOTALL)
_SRC_RE = lazy_re.compile(
- r'<(?!script)(?:[^>]+?\s)src=(?P<quote>")(?P<filename>[^"\']*)\1',
+ r'<(?!script)(?:[^>]+?\s)src=(?P<quote>")(?!\[\[|
{{)(?P<filename>[^"\']*)\1',
re.MULTILINE)
_ICON_RE = lazy_re.compile(
r'<link rel="icon"\s(?:[^>]+?\s)?'
=======================================
--- /trunk/grit/format/html_inline_unittest.py Mon Mar 30 21:25:12 2015 UTC
+++ /trunk/grit/format/html_inline_unittest.py Thu Oct 1 17:54:43 2015 UTC
@@ -37,6 +37,8 @@
<include src="test.html">
<include
src="really-long-long-long-long-long-test-file-omg-so-long.html">
+ <iron-icon src="[[icon]]"></iron-icon><!-- Should be ignored. -->
+ <iron-icon src="{{src}}"></iron-icon><!-- Also ignored. -->
</body>
</html>
''',