Commit 56a8a2bcf4670362f913576ae08d62d1585e82f6
2014-11-15T19:28:43
Merge pull request #395 from zeitgeist87/gh-pages Remove invalid alias declarations, which cause HTML highlighting to fail
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
diff --git a/components/prism-css.js b/components/prism-css.js
index 9550639..ca39b59 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -25,9 +25,9 @@ if (Prism.languages.markup) {
inside: Prism.languages.markup.tag.inside
},
rest: Prism.languages.css
- }
- },
- alias: 'language-css'
+ },
+ alias: 'language-css'
+ }
});
Prism.languages.insertBefore('inside', 'attr-value', {
@@ -42,9 +42,9 @@ if (Prism.languages.markup) {
'attr-value': {
pattern: /.+/gi,
inside: Prism.languages.css
- }
- },
- alias: 'language-css'
+ },
+ alias: 'language-css'
+ }
}
}, Prism.languages.markup.tag);
}
\ No newline at end of file
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index ac84d67..35d39dd 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,punctuation:/[\{\};:]/g,"function":/[-a-z0-9]+(?=\()/ig};if(Prism.languages.markup){Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/ig,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}},alias:"language-css"});Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').+?\1/ig,inside:{"attr-name":{pattern:/^\s*style/ig,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/gi,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag)};
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/gi,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,punctuation:/[\{\};:]/g,"function":/[-a-z0-9]+(?=\()/gi},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/gi,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').+?\1/gi,inside:{"attr-name":{pattern:/^\s*style/gi,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/gi,inside:Prism.languages.css},alias:"language-css"}}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index 5187c81..ef63808 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -20,8 +20,8 @@ if (Prism.languages.markup) {
inside: Prism.languages.markup.tag.inside
},
rest: Prism.languages.javascript
- }
- },
- alias: 'language-javascript'
+ },
+ alias: 'language-javascript'
+ }
});
}
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index f96ad15..9af805f 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g});Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}});Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/ig,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}},alias:"language-javascript"});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/gi,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index f42c66e..5c740f4 100644
--- a/prism.js
+++ b/prism.js
@@ -1,5 +1,4 @@
-
/* **********************************************
Begin prism-core.js
********************************************** */
@@ -508,9 +507,9 @@ if (Prism.languages.markup) {
inside: Prism.languages.markup.tag.inside
},
rest: Prism.languages.css
- }
- },
- alias: 'language-css'
+ },
+ alias: 'language-css'
+ }
});
Prism.languages.insertBefore('inside', 'attr-value', {
@@ -525,9 +524,9 @@ if (Prism.languages.markup) {
'attr-value': {
pattern: /.+/gi,
inside: Prism.languages.css
- }
- },
- alias: 'language-css'
+ },
+ alias: 'language-css'
+ }
}
}, Prism.languages.markup.tag);
}
@@ -596,9 +595,9 @@ if (Prism.languages.markup) {
inside: Prism.languages.markup.tag.inside
},
rest: Prism.languages.javascript
- }
- },
- alias: 'language-javascript'
+ },
+ alias: 'language-javascript'
+ }
});
}