Commit 596fb1ee3327b1a37380e3919c793dcc907a0d39
2015-04-17T19:07:54
Merge pull request #571 from nauzilus/fix-show-language-linenums Work nicely with line-numbers plugin
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
diff --git a/plugins/show-language/index.html b/plugins/show-language/index.html
index aa790af..299a73c 100644
--- a/plugins/show-language/index.html
+++ b/plugins/show-language/index.html
@@ -36,13 +36,6 @@
<pre data-src="plugins/show-language/index.html"></pre>
</section>
-<section>
- <h1>Known Issues</h1>
-
- <ul>
- <li>Changes the appearence of the Funky theme, to be less 'funky' and more 'black'</li>
- </ul>
-</section>
<footer data-src="templates/footer.html" data-type="text/html"></footer>
<script src="prism.js"></script>
diff --git a/plugins/show-language/prism-show-language.css b/plugins/show-language/prism-show-language.css
index 336f0f9..4a3c2f2 100644
--- a/plugins/show-language/prism-show-language.css
+++ b/plugins/show-language/prism-show-language.css
@@ -1,12 +1,7 @@
pre[class*='language-'] {
position: relative;
}
-pre[class*='language-'] > code[data-language] {
- overflow: auto;
- max-height: 28em;
- display: block;
-}
-pre[class*='language-'] > code[data-language]::before {
+pre[class*='language-'][data-language]::before {
content: attr(data-language);
color: black;
background-color: #CFCFCF;
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 7ca2f23..7b345d3 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -9,8 +9,12 @@ var Languages = {
'cpp': 'C++'
};
Prism.hooks.add('before-highlight', function(env) {
+ var pre = env.element.parentNode;
+ if (!pre || !/pre/i.test(pre.nodeName)) {
+ return;
+ }
var language = Languages[env.language] || env.language;
- env.element.setAttribute('data-language', language);
+ pre.setAttribute('data-language', language);
});
})();
diff --git a/plugins/show-language/prism-show-language.min.css b/plugins/show-language/prism-show-language.min.css
index 0444f4d..16a7f46 100644
--- a/plugins/show-language/prism-show-language.min.css
+++ b/plugins/show-language/prism-show-language.min.css
@@ -1 +1 @@
-pre[class*=language-]{position:relative}pre[class*=language-]>code[data-language]{overflow:auto;max-height:28em;display:block}pre[class*=language-]>code[data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
+pre[class*=language-]{position:relative}pre[class*=language-][data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 4ac0d48..3f9280d 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if(self.Prism){var a={csharp:"C#",cpp:"C++"};Prism.hooks.add("before-highlight",function(e){var t=a[e.language]||e.language;e.element.setAttribute("data-language",t)})}}();
\ No newline at end of file
+!function(){if(self.Prism){var e={csharp:"C#",cpp:"C++"};Prism.hooks.add("before-highlight",function(a){var t=a.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var i=e[a.language]||a.language;t.setAttribute("data-language",i)}})}}();
\ No newline at end of file