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

Unified Diff: lib/src/prism/components/prism-aspnet.js

Issue 1418513006: update elements and fix some bugs (Closed) Base URL: git@github.com:dart-lang/polymer_elements.git@master
Patch Set: code review updates Created 5 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 | « lib/src/prism/components/prism-apl.min.js ('k') | lib/src/prism/components/prism-aspnet.min.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/prism/components/prism-aspnet.js
diff --git a/lib/src/prism/components/prism-aspnet.js b/lib/src/prism/components/prism-aspnet.js
index 291823e2a5acebf63b687dff0c171ebfbdeadf14..9511e453d6df24ec82836bbd35d087bb0d83398b 100644
--- a/lib/src/prism/components/prism-aspnet.js
+++ b/lib/src/prism/components/prism-aspnet.js
@@ -29,23 +29,8 @@ Prism.languages.insertBefore('aspnet', 'comment', {
// script runat="server" contains csharp, not javascript
Prism.languages.insertBefore('aspnet', Prism.languages.javascript ? 'script' : 'tag', {
'asp script': {
- pattern: /<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,
- inside: {
- tag: {
- pattern: /<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,
- inside: Prism.languages.aspnet.tag.inside
- },
- rest: Prism.languages.csharp || {}
- }
+ pattern: /(<script(?=.*runat=['"]?server['"]?)[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,
+ lookbehind: true,
+ inside: Prism.languages.csharp || {}
}
-});
-
-// Hacks to fix eager tag matching finishing too early: <script src="<% Foo.Bar %>"> => <script src="<% Foo.Bar %>
-if ( Prism.languages.aspnet.style ) {
- Prism.languages.aspnet.style.inside.tag.pattern = /<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i;
- Prism.languages.aspnet.style.inside.tag.inside = Prism.languages.aspnet.tag.inside;
-}
-if ( Prism.languages.aspnet.script ) {
- Prism.languages.aspnet.script.inside.tag.pattern = Prism.languages.aspnet['asp script'].inside.tag.pattern;
- Prism.languages.aspnet.script.inside.tag.inside = Prism.languages.aspnet.tag.inside;
-}
+});
« no previous file with comments | « lib/src/prism/components/prism-apl.min.js ('k') | lib/src/prism/components/prism-aspnet.min.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698