Commit 92f446fa9dd8c70855aca83f3c0376925ad1caa8
2012-07-16T18:56:40
Line linking
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 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259
diff --git a/code.js b/code.js
index 3252f2d..1b6848b 100644
--- a/code.js
+++ b/code.js
@@ -29,7 +29,16 @@ document.body.addEventListener('contentreceived', function(evt) {
'svg': 'markup'
}[(evt.src.match(/\.(\w+)$/) || [,''])[1]];
- pre.className = 'prism language-' + language;
+ pre.className = 'prism';
- Prism.highlight(pre, true);
+ var code = document.createElement('code');
+
+ code.className = 'lang-' + language;
+
+ code.textContent = pre.textContent;
+ pre.textContent = '';
+
+ pre.appendChild(code);
+
+ Prism.highlight(code, true);
});
\ No newline at end of file
diff --git a/examples.html b/examples.html
index dad43dc..7b53042 100644
--- a/examples.html
+++ b/examples.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
-<title>Prism</title>
+<title>Examples ▲ Prism</title>
<link rel="stylesheet" href="style.css" />
<link rel="stylesheet" href="prism.css" data-noprefix />
<script src="../prefixfree/prefixfree.min.js"></script>
diff --git a/plugins/line-highlight/index.html b/plugins/line-highlight/index.html
index 0c8afbd..dd5dca8 100644
--- a/plugins/line-highlight/index.html
+++ b/plugins/line-highlight/index.html
@@ -3,17 +3,18 @@
<head>
<meta charset="utf-8" />
-<title>Prism</title>
-<link rel="stylesheet" href="../../style.css" />
-<link rel="stylesheet" href="../../prism.css" data-noprefix />
-<link rel="stylesheet" href="prism-line-highlight.css" data-noprefix />
-<script src="../../../prefixfree/prefixfree.min.js"></script>
+<title>Line highlight ▲ Prism plugins</title>
+<base href="../.." />
+<link rel="stylesheet" href="style.css" />
+<link rel="stylesheet" href="prism.css" data-noprefix />
+<link rel="stylesheet" href="plugins/line-highlight/prism-line-highlight.css" data-noprefix />
+<script src="../prefixfree/prefixfree.min.js"></script>
</head>
<body>
<header>
- <h1><img src="../../logo.svg" alt="Prism" /> plugins</h1>
+ <h1><img src="logo.svg" alt="Prism" /> plugins</h1>
<h2>Line highlight plugin</h2>
<p>Highlights specific lines and/or line ranges.</p>
@@ -58,40 +59,24 @@
<h1>Examples</h1>
<h2>Line 2</h2>
- <pre class="prism" data-line="2"><code class="language-css">*
-{
- color: red;
-}</code></pre>
+ <pre data-line="2" data-src="plugins/line-highlight/prism-line-highlight.js" id="play"></pre>
- <h2>Lines 1-2</h2>
- <pre class="prism" data-line="1-2"><code class="language-css">*
-{
- color: red;
-}</code></pre>
+ <h2>Lines 15-25</h2>
+ <pre data-line="15-25" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
- <h2>Line 1 and lines 3-4</h2>
- <pre class="prism" data-line="1,3-4"><code class="language-css">*
-{
- color: red;
-}</code></pre>
+ <h2>Line 1 and lines 3-4 and line 42</h2>
+ <pre data-line="1,3-4,42" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
- <h2>Line 1 and line 4</h2>
- <pre class="prism" data-line="1,4"><code class="language-css">*
-{
- color: red;
-}</code></pre>
-
- <h2>Line 42, start from line 41</h2>
- <pre class="prism" data-line="42" data-line-offset="40"><code class="language-css">*
-{
- color: red;
-}</code></pre>
+ <h2>Line 43, starting from line 41</h2>
+ <pre data-line="43" data-line-offset="40" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
</section>
<footer data-src="templates/footer.html" data-type="text/html"></footer>
-<script src="../../prism.js"></script>
-<script src="prism-line-highlight.js"></script>
+<script src="prism.js"></script>
+<script src="utopia.js"></script>
+<script src="code.js"></script>
+<script src="plugins/line-highlight/prism-line-highlight.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/plugins/line-highlight/prism-line-highlight.css b/plugins/line-highlight/prism-line-highlight.css
index c1e478e..b18fa72 100644
--- a/plugins/line-highlight/prism-line-highlight.css
+++ b/plugins/line-highlight/prism-line-highlight.css
@@ -3,6 +3,10 @@ pre.prism[data-line] {
padding: 1em 0 1em 3em;
}
+pre.prism[data-line] > code {
+ position: relative;
+}
+
.line-highlight {
position: absolute;
left: 0;
diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index a2ec9f8..cd45e9b 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -1,44 +1,97 @@
(function(){
-if(!window.Prism || !window.getComputedStyle) {
+if(!window.Prism
+ || !window.addEventListener
+ || !window.getComputedStyle
+ || !document.querySelectorAll) {
return;
}
-var CRLF = crlf = /\r?\n|\r/g;
+function $$(expr, con) {
+ return Array.prototype.slice.call((con || document).querySelectorAll(expr));
+}
-Prism.hooks.add('after-highlight', function(env) {
- var pre = /pre/i.test(env.element.nodeName)? env.element
- : /pre/i.test(env.element.parentNode.nodeName)? env.element.parentNode
- : null;
-
- if (!pre || !pre.hasAttribute('data-line')) {
- return;
- }
-
- var ranges = pre.getAttribute('data-line').replace(/\s+/g, '').split(',');
- var offset = +pre.getAttribute('data-line-offset') || 0;
-
- for (var i=0, range; range=ranges[i++];) {
+var CRLF = crlf = /\r?\n|\r/g,
+ preTag = /pre/i;
+
+function highlightLines(pre, lines, classes) {
+ var ranges = lines.replace(/\s+/g, '').split(','),
+ offset = +pre.getAttribute('data-line-offset') || 0;
+
+ var cs = getComputedStyle(pre),
+ lineHeight = parseFloat(cs.lineHeight);
+
+ for (var i=0, range; range = ranges[i++];) {
range = range.split('-');
-
- var start = +range[0], end = +range[1] || start;
+
+ var start = +range[0],
+ end = +range[1] || start;
var line = document.createElement('div');
- line.className = 'line-highlight';
+
+ line.className = (classes || '') + ' line-highlight';
line.setAttribute('data-start', start);
if(end > start) {
line.setAttribute('data-end', end);
}
-
- var lines = (env.code.match(CRLF) || []).length + 1,
- lineHeight = parseFloat(getComputedStyle(pre).height)/lines;
-
+
line.style.height = (end - start + 1) * lineHeight + 'px';
line.style.top = (start - offset - 1) * lineHeight + 'px';
pre.insertBefore(line, pre.firstChild);
}
+}
+
+function applyHash() {
+ var hash = location.hash.slice(1);
+
+ // Remove pre-existing temporary lines
+ $$('.temporary.line-highlight').forEach(function (line) {
+ line.parentNode.removeChild(line);
+ });
+
+ var range = (hash.match(/\.([\d,-]+)$/) || [,''])[1];
+
+ if(!range || document.getElementById(hash)) {
+ return;
+ }
+
+ var id = hash.slice(0, hash.lastIndexOf('.')),
+ pre = document.getElementById(id);
+
+ if(!pre) {
+ return;
+ }
+
+ highlightLines(pre, range, 'temporary ');
+
+ document.querySelector('.temporary.line-highlight').scrollIntoView();
+}
+
+var fakeTimer = 0; // Hack to limit the number of times applyHash() runs
+
+Prism.hooks.add('after-highlight', function(env) {
+ clearTimeout(fakeTimer);
+
+ var pre = preTag.test(env.element.nodeName)? env.element
+ : preTag.test(env.element.parentNode.nodeName)? env.element.parentNode
+ : null,
+ lines = pre.getAttribute('data-line');
+
+ if (!pre || !lines) {
+ return;
+ }
+
+ $$('.line-highlight', pre).forEach(function (line) {
+ line.parentNode.removeChild(line);
+ });
+
+ highlightLines(pre, lines);
+
+ fakeTimer = setTimeout(applyHash, 1);
});
+addEventListener('hashchange', applyHash);
+
})();
\ No newline at end of file