Go back to using textContent for pre+code to avoid over-escaping.

tc39 · Apr 21, 2016 · 29712f5 · 29712f5
1 parent 3e892d1
commit 29712f5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/Spec.js b/lib/Spec.js
@@ -225,7 +225,7 @@ module.exports = class Spec {
       if (!classAttr) continue;
 
       const lang = classAttr.replace(/lang(uage)?\-/, '');
-      let input = codes[i].innerHTML;
+      let input = codes[i].textContent
 
       // remove leading and trailing blank lines
       input = input.replace(/^(\s*[\r\n])+|([\r\n]\s*)+$/g, '');

diff --git a/lib/Xref.js b/lib/Xref.js
@@ -20,6 +20,7 @@ module.exports = class Xref extends Builder {
 
     if (!href && !aoid) {
       utils.logWarning('xref has no href or aoid.');
+      console.log(xref.outerHTML);
       return;
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ecmarkup",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Custom element definitions and core utilities for markup that specifies ECMAScript and related technologies.",
   "main": "lib/ecmarkup.js",
   "scripts": {

diff --git a/test/code.html.baseline b/test/code.html.baseline
@@ -5,12 +5,12 @@
   <h1><span class="secnum">1</span>Test Clause<span class="utils"><span class="anchor"><a href="#foo">#</a></span></span></h1>
   <p>Increases indentaion level.</p>
   <pre><code class="lang-javascript hljs">global1.Zone.current; <span class="hljs-comment">// succeeds</span>
-global2.Zone.current; <span class="hljs-comment">// throws: &lt;var&gt;currentRealm&lt;/var&gt; = &lt;var&gt;realm1&lt;/var&gt;; &lt;var&gt;thisRealm&lt;/var&gt; = &lt;var&gt;functionRealm&lt;/var&gt; = &lt;var&gt;realm2&lt;/var&gt;</span>
+global2.Zone.current; <span class="hljs-comment">// throws: currentRealm = realm1; thisRealm = functionRealm = realm2</span>
 
 <span class="hljs-keyword">const</span> getter1 = <span class="hljs-built_in">Object</span>.getOwnPropertyDescriptor(global1.Zone, <span class="hljs-string">"current"</span>).get;
 <span class="hljs-keyword">const</span> getter2 = <span class="hljs-built_in">Object</span>.getOwnPropertyDescriptor(global2.Zone, <span class="hljs-string">"current"</span>).get;
 
-getter1.call(global2.Zone); <span class="hljs-comment">// throws: &lt;var&gt;currentRealm&lt;/var&gt; = &lt;var&gt;functionRealm&lt;/var&gt; = &lt;var&gt;realm1&lt;/var&gt;; &lt;var&gt;thisRealm&lt;/var&gt; = &lt;var&gt;realm2&lt;/var&gt;</span>
-getter2.call(global1.Zone); <span class="hljs-comment">// throws: &lt;var&gt;currentRealm&lt;/var&gt; = &lt;var&gt;thisRealm&lt;/var&gt; = &lt;var&gt;realm1&lt;/var&gt;; &lt;var&gt;functionRealm&lt;/var&gt; = &lt;var&gt;realm2&lt;/var&gt;</span></code></pre>
+getter1.call(global2.Zone); <span class="hljs-comment">// throws: currentRealm = functionRealm = realm1; thisRealm = realm2</span>
+getter2.call(global1.Zone); <span class="hljs-comment">// throws: currentRealm = thisRealm = realm1; functionRealm = realm2</span></code></pre>
 </emu-clause>
 </body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ module.exports = class Xref extends Builder { @@
         if (!href && !aoid) {
           utils.logWarning('xref has no href or aoid.');
+          console.log(xref.outerHTML);
           return;
         }
@@ Expand Down @@