Fixed bug with classnames

jzaefferer · Jul 31, 2012 · c75bbc2 · c75bbc2
1 parent 95af8d4
commit c75bbc2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -74,14 +74,13 @@ var _ = self.Prism = {
 		}
 
 		// Set language on the element, if not present
-		element.className = element.className.replace(lang, '') + ' language-' + language;
+		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 
 		// Set language on the parent, for styling
 		parent = element.parentNode;
 
 		if (/pre/i.test(parent.nodeName)) {
-			var parentLanguage = (parent.className.match(lang) || [,''])[1];
-			parent.className = parent.className.replace(lang, '') + ' language-' + parentLanguage; 
+			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language; 
 		}
 
 		var code = element.textContent.trim();

diff --git a/components/prism-core.min.js b/components/prism-core.min.js
diff --git a/examples.html b/examples.html
@@ -30,6 +30,9 @@ <h2>code.language-css</h2>
 	<h2>pre.language-css > code</h2>
 	<pre class="language-css"><code>p { color: red; }</code></pre>
 
+	<h2>pre > code.language-css</h2>
+	<pre><code class="language-css">p { color: red; }</code></pre>
+
 	<h2>pre.language-css > code.language-*</h2>
 	<pre class="language-css"><code class="language-*">p { color: red; }</code></pre>
 

diff --git a/prism.js b/prism.js
@@ -80,14 +80,13 @@ var _ = self.Prism = {
 		}
 
 		// Set language on the element, if not present
-		element.className = element.className.replace(lang, '') + ' language-' + language;
+		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 
 		// Set language on the parent, for styling
 		parent = element.parentNode;
 
 		if (/pre/i.test(parent.nodeName)) {
-			var parentLanguage = (parent.className.match(lang) || [,''])[1];
-			parent.className = parent.className.replace(lang, '') + ' language-' + parentLanguage; 
+			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language; 
 		}
 
 		var code = element.textContent.trim();