Skip to content

Commit c9661d1

Browse files
authored
Merge pull request #102 from WebCoder49/allow-language-attr-initially-unset
Allow language attribute to be changed after being unset
2 parents 493e3d7 + 781489e commit c9661d1

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

code-input.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,13 +773,15 @@ var codeInput = {
773773
if (code.classList.contains(`language-${newValue}`)) break; // Already updated
774774
}
775775

776+
if(oldValue !== null) {
777+
// Case insensitive
778+
oldValue = oldValue.toLowerCase();
776779

777-
// Case insensitive
778-
oldValue = oldValue.toLowerCase();
779-
780-
// Remove old language class and add new
781-
code.classList.remove("language-" + oldValue); // From codeElement
782-
code.parentElement.classList.remove("language-" + oldValue); // From preElement
780+
// Remove old language class and add new
781+
code.classList.remove("language-" + oldValue); // From codeElement
782+
code.parentElement.classList.remove("language-" + oldValue); // From preElement
783+
}
784+
// Add new language class
783785
code.classList.remove("language-none"); // Prism
784786
code.parentElement.classList.remove("language-none"); // Prism
785787

tests/hljs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h4><a href="prism.html">Test for Prism.js</a></h4>
4141

4242
<details id="collapse-results"><summary>Test Results (Click to Open)</summary><pre id="test-results"></pre></details>
4343
<form method="GET" action="https://google.com/search" target="_blank">
44-
<code-input language="JavaScript" name="q">console.log("Hello, World!");
44+
<code-input name="q">console.log("Hello, World!");
4545
// A second line
4646
// A third line with &lt;html> tags</code-input>
4747
<input type="submit" value="Search Google For Code"/>

tests/prism.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h4><a href="hljs.html">Test for highlight.js</a></h4>
4343

4444
<details id="collapse-results"><summary>Test Results (Click to Open)</summary><pre id="test-results"></pre></details>
4545
<form method="GET" class="line-numbers" action="https://google.com/search" target="_blank">
46-
<code-input language="JavaScript" name="q">console.log("Hello, World!");
46+
<code-input name="q">console.log("Hello, World!");
4747
// A second line
4848
// A third line with &lt;html> tags</code-input>
4949
<input type="submit" value="Search Google For Code"/>

tests/tester.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ console.log("I've got another line!", 2 &lt; 3, "should be true.");`);
241241
if(!isHLJS) {
242242
// Highlight.js has autodetect plugin that should make this fail, so don't run these tests with it.
243243
testAssertion("Core", "Language attribute Initial value",
244-
codeInputElement.codeElement.classList.contains("language-javascript")
244+
!codeInputElement.codeElement.classList.contains("language-javascript")
245245
&& !codeInputElement.codeElement.classList.contains("language-html"),
246-
`Language set to JavaScript but code element's class name is ${codeInputElement.codeElement.className}.`);
246+
`Language unset but code element's class name is ${codeInputElement.codeElement.className}.`);
247247

248248
codeInputElement.setAttribute("language", "HTML");
249249

0 commit comments

Comments
 (0)