nodeToCode() now works on void elements.

mozilla · May 27, 2012 · 562994a · 562994a
1 parent bd7866d
commit 562994a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/js/fc/ui/preview-to-editor-mapping.js b/js/fc/ui/preview-to-editor-mapping.js
@@ -39,12 +39,15 @@ define([
     var path = "html " + pathTo(root, node);
     var parallelNode = docFrag.querySelector(path);
     var result = null;
-    if (parallelNode)
+    if (parallelNode) {
+      var pi = parallelNode.parseInfo;
+      var isVoidElement = !pi.closeTag;
       result = {
-        start: parallelNode.parseInfo.openTag.start,
-        end: parallelNode.parseInfo.closeTag.end,
-        contentStart: parallelNode.parseInfo.openTag.end
+        start: pi.openTag.start,
+        end: isVoidElement ? pi.openTag.end : pi.closeTag.end,
+        contentStart: isVoidElement ? pi.openTag.start : pi.openTag.end
       };
+    }
     if (origDocFrag != docFrag) {
       for (i = 0; i < htmlNode.childNodes.length; i++)
         origDocFrag.appendChild(htmlNode.childNodes[i]);

diff --git a/test/preview-to-editor-mapping/test-preview-to-editor-mapping.js b/test/preview-to-editor-mapping/test-preview-to-editor-mapping.js
@@ -48,6 +48,13 @@ require([
     expect: "<p>u</p>"
   });
 
+  n2cTest({
+    name: "nodeToCode() works on void element",
+    html: '<html><img id="foo"></html>',
+    selector: "img",
+    expect: '<img id="foo">'
+  });
+
   n2cTest({
     name: "nodeToCode() can't map to anything from implied <html>",
     html: "<p>hi</p>",