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

Unified Diff: lib/src/prism/components/prism-javascript.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-java.min.js ('k') | lib/src/prism/components/prism-javascript.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-javascript.js
diff --git a/lib/src/prism/components/prism-javascript.js b/lib/src/prism/components/prism-javascript.js
index d4f1025dbfa703ddacec4fb4130f19b9a949c9a7..1c75a760f0d8190d80b4268f223dc701fc3815ba 100644
--- a/lib/src/prism/components/prism-javascript.js
+++ b/lib/src/prism/components/prism-javascript.js
@@ -1,7 +1,8 @@
Prism.languages.javascript = Prism.languages.extend('clike', {
'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
- 'function': /(?!\d)[a-z0-9_$]+(?=\()/i
+ // Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
+ 'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i
});
Prism.languages.insertBefore('javascript', 'keyword', {
@@ -33,15 +34,12 @@ Prism.languages.insertBefore('javascript', 'class-name', {
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
'script': {
- pattern: /<script[\w\W]*?>[\w\W]*?<\/script>/i,
- inside: {
- 'tag': {
- pattern: /<script[\w\W]*?>|<\/script>/i,
- inside: Prism.languages.markup.tag.inside
- },
- rest: Prism.languages.javascript
- },
+ pattern: /(<script[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,
+ lookbehind: true,
+ inside: Prism.languages.javascript,
alias: 'language-javascript'
}
});
}
+
+Prism.languages.js = Prism.languages.javascript;
« no previous file with comments | « lib/src/prism/components/prism-java.min.js ('k') | lib/src/prism/components/prism-javascript.min.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698