--- a/editcommands.html Tue Jun 07 15:20:52 2011 -0600
+++ b/editcommands.html Sun Jun 12 12:19:28 2011 -0600
@@ -38,7 +38,7 @@
<body class=draft>
<div class=head id=head>
<h1>HTML Editing Commands</h1>
-<h2 class="no-num no-toc" id=work-in-progress-—-last-update-7-june-2011>Work in Progress — Last Update 7 June 2011</h2>
+<h2 class="no-num no-toc" id=work-in-progress-—-last-update-12-june-2011>Work in Progress — Last Update 12 June 2011</h2>
<dl>
<dt>Editor
<dd>Aryeh Gregor <ayg+spec@aryeh.name>
@@ -2551,29 +2551,9 @@
<li>Let <var title="">start node</var> equal <var title="">node</var> and let <var title="">start
offset</var> equal <var title="">offset</var>.
- <!--
- Go up until we're no longer at the beginning of an element. As a special
- case, we make sure to remove a preceding extraneous line break in cases
- like
-
- foo<br><p>[]bar</p>
- -> foo<p>[]bar</p>
- -> foo[]bar.
-
- We have to take care that we remove the line break before we go all the way
- up to the node that contains the line break. Otherwise the offset will no
- longer be correct: it will be one too high. (Try removing "and start node
- is the first child of its parent" from the next line, and the two lines
- after the extraneous line break removal, and see what happens.)
- -->
- <li>While <var title="">start offset</var> is zero and <var title="">start node</var> is the
- first <a class=external data-anolis-spec=domcore href=http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-tree-child title=concept-tree-child>child</a> of its <a class=external data-anolis-spec=domcore href=http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-tree-parent title=concept-tree-parent>parent</a>, set <var title="">start offset</var> to the
- <a class=external data-anolis-spec=domrange href=http://html5.org/specs/dom-range.html#concept-indexof title=concept-indexof>index</a> of <var title="">start node</var> and then set <var title="">start node</var> to
- its <a class=external data-anolis-spec=domcore href=http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-tree-parent title=concept-tree-parent>parent</a>.
-
- <li>Set <var title="">start offset</var> to the <a class=external data-anolis-spec=domrange href=http://html5.org/specs/dom-range.html#concept-indexof title=concept-indexof>index</a> of <var title="">start node</var>.
-
- <li>Set <var title="">start node</var> to its <a class=external data-anolis-spec=domcore href=http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-tree-parent title=concept-tree-parent>parent</a>.
+ <li>While <var title="">start offset</var> is zero, set <var title="">start offset</var> to
+ the <a class=external data-anolis-spec=domrange href=http://html5.org/specs/dom-range.html#concept-indexof title=concept-indexof>index</a> of <var title="">start node</var> and then set <var title="">start node</var>
+ to its <a class=external data-anolis-spec=domcore href=http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-tree-parent title=concept-tree-parent>parent</a>.
<!--
Special case:
--- a/implementation.js Tue Jun 07 15:20:52 2011 -0600
+++ b/implementation.js Sun Jun 12 12:19:28 2011 -0600
@@ -3285,21 +3285,13 @@
var startNode = node;
var startOffset = offset;
- // "While start offset is zero and start node is the first child of
- // its parent, set start offset to the index of start node and then
- // set start node to its parent."
- while (startOffset == 0
- && startNode == startNode.parentNode.firstChild) {
+ // "While start offset is zero, set start offset to the index of
+ // start node and then set start node to its parent."
+ while (startOffset == 0) {
startOffset = getNodeIndex(startNode);
startNode = startNode.parentNode;
}
- // "Set start offset to the index of start node."
- startOffset = getNodeIndex(startNode);
-
- // "Set start node to its parent."
- startNode = startNode.parentNode;
-
// "If the child of start node with index start offset minus one is
// an hr, or the child is a br and the br's previousSibling is
// either a br or not an inline node, set node to start node and
--- a/source.html Tue Jun 07 15:20:52 2011 -0600
+++ b/source.html Sun Jun 12 12:19:28 2011 -0600
@@ -2531,29 +2531,9 @@
<li>Let <var>start node</var> equal <var>node</var> and let <var>start
offset</var> equal <var>offset</var>.
- <!--
- Go up until we're no longer at the beginning of an element. As a special
- case, we make sure to remove a preceding extraneous line break in cases
- like
-
- foo<br><p>[]bar</p>
- -> foo<p>[]bar</p>
- -> foo[]bar.
-
- We have to take care that we remove the line break before we go all the way
- up to the node that contains the line break. Otherwise the offset will no
- longer be correct: it will be one too high. (Try removing "and start node
- is the first child of its parent" from the next line, and the two lines
- after the extraneous line break removal, and see what happens.)
- -->
- <li>While <var>start offset</var> is zero and <var>start node</var> is the
- first [[child]] of its [[parent]], set <var>start offset</var> to the
- [[index]] of <var>start node</var> and then set <var>start node</var> to
- its [[parent]].
-
- <li>Set <var>start offset</var> to the [[index]] of <var>start node</var>.
-
- <li>Set <var>start node</var> to its [[parent]].
+ <li>While <var>start offset</var> is zero, set <var>start offset</var> to
+ the [[index]] of <var>start node</var> and then set <var>start node</var>
+ to its [[parent]].
<!--
Special case: