Commit 8ecdd7c4eeecfa07259d30f66888be7691cb040b
2012-07-11T14:22:23
Removed switch for automatic highlighting
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 115 116
diff --git a/components/prism-core.js b/components/prism-core.js
index 0114b6b..b2ef96d 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -146,20 +146,21 @@ if (!self.document) {
self.postMessage(_.tokenize(code, _.languages[lang]));
self.close();
}, false);
-}
-else {
- // Should we automatically highlight?
- var script = document.getElementsByTagName('script');
- script = script[script.length - 1];
+ return;
+}
+
+// Get current script and highlight
+var script = document.getElementsByTagName('script');
+
+script = script[script.length - 1];
+
+if (script) {
+ _.filename = script.src;
- if (script) {
- _.filename = script.src;
-
- document.addEventListener('DOMContentLoaded', function() {
- _.highlightAll();
- });
- }
+ document.addEventListener('DOMContentLoaded', function() {
+ _.highlightAll();
+ });
}
})();
\ No newline at end of file
diff --git a/index.html b/index.html
index 35fe06a..a2dd47b 100644
--- a/index.html
+++ b/index.html
@@ -3,6 +3,7 @@
<head>
<script>
+ // Just a lil’ script to show off that inline JS gets highlighted
window.console && console.log('foo');
</script>
<meta charset="utf-8" />
@@ -166,7 +167,7 @@
<p>Handcrafted with love, by Lea Verou</p>
</div></footer>
-<script src="prism.js" data-automatic></script>
+<script src="prism.js"></script>
<script src="utopia.js"></script>
<script src="code.js"></script>
diff --git a/prism.js b/prism.js
index 75e794e..89579ef 100644
--- a/prism.js
+++ b/prism.js
@@ -146,20 +146,21 @@ if (!self.document) {
self.postMessage(_.tokenize(code, _.languages[lang]));
self.close();
}, false);
-}
-else {
- // Should we automatically highlight?
- var script = document.getElementsByTagName('script');
- script = script[script.length - 1];
+ return;
+}
+
+// Get current script and highlight
+var script = document.getElementsByTagName('script');
+
+script = script[script.length - 1];
+
+if (script) {
+ _.filename = script.src;
- if (script) {
- _.filename = script.src;
-
- document.addEventListener('DOMContentLoaded', function() {
- _.highlightAll();
- });
- }
+ document.addEventListener('DOMContentLoaded', function() {
+ _.highlightAll();
+ });
}
})();
@@ -171,7 +172,7 @@ else {
Prism.languages.css = {
'comment': /\/\*[\w\W]*?\*\//g,
'atrule': /@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,
- 'selector': /[^\{\}\s][^\{\}]+(?=\s*\{)/g,
+ 'selector': /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
'important': /\B!important\b/gi,
'ignore': /&(lt|gt|amp);/gi,
@@ -190,7 +191,7 @@ Prism.languages.javascript = {
'keyword': /\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,
'boolean': /\b(true|false)\b/g,
'number': /\b-?(0x)?\d*\.?\d+\b/g,
- 'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|:/g,
+ 'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|:|\*|\//g,
'ignore': /&(lt|gt|amp);/gi,
'punctuation': /[{}[\];(),.]/g
};