Made the language matching a bit more lax. Now it can be on the <pre>…

… element even when it has <code> children. Also, it can be lang-xxxx instead of language-xxxx.
PrismJS · Jul 16, 2012 · de85c1a · de85c1a
1 parent 21b6ea1
commit de85c1a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -6,6 +6,9 @@
 
 (function(){
 
+// Private helper vars
+var langRegex = /lang(?:uage)?-(\w+)/i
+
 var _ = self.Prism = {
 	tokens: {
 		url: /[a-z]{3,4}s?:\/\/\S+/g
@@ -30,7 +33,10 @@ var _ = self.Prism = {
 			return;
 		}
 
-		var language = (element.className.match(/language-(\w+)/i) || [])[1],
+		var language = (
+				element.className.match(langRegex) 
+				|| element.parentNode.className.match(langRegex)
+				|| [])[1],
 		    tokens = _.languages[language];
 
 		if (!tokens) {