From eb9a83c22745a6ea18cf6834be0aa0448b99c12c Mon Sep 17 00:00:00 2001 From: Daniel Flint Date: Thu, 17 Dec 2015 21:02:26 +1100 Subject: [PATCH] The data-language attribute is no longer of any use, so remove it from the code. It was only applicable when using CSS pseudo elements to show the language name, which is no longer the case. --- plugins/show-language/prism-show-language.css | 2 +- plugins/show-language/prism-show-language.js | 9 ++------- plugins/show-language/prism-show-language.min.js | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/show-language/prism-show-language.css b/plugins/show-language/prism-show-language.css index 9fddc2b2c4..646daaf93b 100644 --- a/plugins/show-language/prism-show-language.css +++ b/plugins/show-language/prism-show-language.css @@ -2,7 +2,7 @@ div.prism-show-language { position: relative; } -div.prism-show-language > div.prism-show-language-label[data-language] { +div.prism-show-language > div.prism-show-language-label { color: black; background-color: #CFCFCF; display: inline-block; diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js index 981384d6e1..5ab50cfd93 100644 --- a/plugins/show-language/prism-show-language.js +++ b/plugins/show-language/prism-show-language.js @@ -12,7 +12,6 @@ Prism.hooks.add('before-highlight', function(env) { return; } var language = Languages[env.language] || (env.language.substring(0, 1).toUpperCase() + env.language.substring(1)); - pre.setAttribute('data-language', language); /* check if the divs already exist */ var sib = pre.previousSibling; @@ -21,23 +20,19 @@ Prism.hooks.add('before-highlight', function(env) { sib.firstChild && /\s*\bprism-show-language-label\b\s*/.test(sib.firstChild.className)) { div2 = sib.firstChild; - if (div2.getAttribute('data-language') !== language) { - div2.setAttribute('data-language', language); - div2.innerHTML = language; - } } else { div = document.createElement('div'); div2 = document.createElement('div'); div2.className = 'prism-show-language-label'; - div2.setAttribute('data-language', language); - div2.innerHTML = language; div.className = 'prism-show-language'; div.appendChild(div2); pre.parentNode.insertBefore(div, pre); } + + div2.innerHTML = language; }); })(); diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js index 7d742c509e..74875ac401 100644 --- a/plugins/show-language/prism-show-language.min.js +++ b/plugins/show-language/prism-show-language.min.js @@ -1 +1 @@ -!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",asciidoc:"AsciiDoc",aspnet:"ASP.NET (C#)",autoit:"AutoIt",autohotkey:"AutoHotkey",basic:"BASIC",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",glsl:"GLSL",http:"HTTP",inform7:"Inform 7",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",mel:"MEL",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",parigp:"PARI/GP",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",vim:"vim",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(a){var s=a.element.parentNode;if(s&&/pre/i.test(s.nodeName)){var t=e[a.language]||a.language.substring(0,1).toUpperCase()+a.language.substring(1);s.setAttribute("data-language",t);var i,r,l=s.previousSibling;l&&/\s*\bprism-show-language\b\s*/.test(l.className)&&l.firstChild&&/\s*\bprism-show-language-label\b\s*/.test(l.firstChild.className)?(r=l.firstChild,r.getAttribute("data-language")!==t&&(r.setAttribute("data-language",t),r.innerHTML=t)):(i=document.createElement("div"),r=document.createElement("div"),r.className="prism-show-language-label",r.setAttribute("data-language",t),r.innerHTML=t,i.className="prism-show-language",i.appendChild(r),s.parentNode.insertBefore(i,s))}})}}(); \ No newline at end of file +!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",asciidoc:"AsciiDoc",aspnet:"ASP.NET (C#)",autoit:"AutoIt",autohotkey:"AutoHotkey",basic:"BASIC",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",glsl:"GLSL",http:"HTTP",inform7:"Inform 7",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",mel:"MEL",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",parigp:"PARI/GP",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",vim:"vim",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var a=s.element.parentNode;if(a&&/pre/i.test(a.nodeName)){var i,t,r=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1),l=a.previousSibling;l&&/\s*\bprism-show-language\b\s*/.test(l.className)&&l.firstChild&&/\s*\bprism-show-language-label\b\s*/.test(l.firstChild.className)?t=l.firstChild:(i=document.createElement("div"),t=document.createElement("div"),t.className="prism-show-language-label",i.className="prism-show-language",i.appendChild(t),a.parentNode.insertBefore(i,a)),t.innerHTML=r}})}}(); \ No newline at end of file