- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 07 Sep 2012 11:43:49 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv16552
Modified Files:
dnd.html editing-apis.html infrastructure.html
single-page.html spec.html
Log Message:
commit 2938f0832fe6a3ec4a1fbce53ada031b2ca6e38e
Author: ianh <ianh@340c8d12-0b0e-0410-8428-c7bf67bfef74>
Date: Thu Jun 28 23:12:26 2012 +0000
[giow] (2) Excise all remaining mentions of DOMStringList
Affected topics: DOM APIs, HTML, Microdata
git-svn-id: http://svn.whatwg.org/webapps@7158 340c8d12-0b0e-0410-8428-c7bf67bfef74
(cherry picked from commit 542665c1e067c57a2b6b3c28893e19c370b9ba7e)
Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -d -r1.1294 -r1.1295
--- infrastructure.html 7 Sep 2012 00:13:58 -0000 1.1294
+++ infrastructure.html 7 Sep 2012 11:43:45 -0000 1.1295
@@ -1105,7 +1105,6 @@
<li><dfn id="htmlcollection"><code>HTMLCollection</code></dfn> interface, and the terms <dfn id="collections-0">collections</dfn> and <dfn id="represented-by-the-collection">represented by the collection</dfn></li>
- <li><dfn id="domstringlist"><code>DOMStringList</code></dfn> interface</li>
<li><dfn id="domtokenlist"><code>DOMTokenList</code></dfn> interface</li>
<li><dfn id="domsettabletokenlist"><code>DOMSettableTokenList</code></dfn> interface</li>
Index: dnd.html
===================================================================
RCS file: /sources/public/html5/spec/dnd.html,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- dnd.html 7 Sep 2012 00:13:57 -0000 1.258
+++ dnd.html 7 Sep 2012 11:43:44 -0000 1.259
@@ -700,7 +700,7 @@
void <a href="#dom-datatransfer-addelement" title="dom-DataTransfer-addElement">addElement</a>(Element element);
/* old interface */
- readonly attribute <a href="infrastructure.html#domstringlist">DOMStringList</a> <a href="#dom-datatransfer-types" title="dom-DataTransfer-types">types</a>;
+ readonly attribute <span>DOMString</span>[] <a href="#dom-datatransfer-types" title="dom-DataTransfer-types">types</a>;
DOMString <a href="#dom-datatransfer-getdata" title="dom-DataTransfer-getData">getData</a>(DOMString format);
void <a href="#dom-datatransfer-setdata" title="dom-DataTransfer-setData">setData</a>(DOMString format, DOMString data);
void <a href="#dom-datatransfer-cleardata" title="dom-DataTransfer-clearData">clearData</a>(optional DOMString format);
@@ -729,7 +729,8 @@
<p>Returns the kinds of operations that are to be allowed.</p>
- <p>Can be set, to change the allowed operations.</p>
+ <p>Can be set (during the <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code> event), to change the
+ allowed operations.</p>
<p>The possible values are "<code title="">none</code>", "<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">link</code>", "<code title="">linkMove</code>", "<code title="">move</code>", "<code title="">all</code>", and "<code title="">uninitialized</code>",</p>
@@ -767,10 +768,9 @@
<dd>
- <p>Returns a <code><a href="infrastructure.html#domstringlist">DOMStringList</a></code> listing the formats that
- were set in the <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code>
- event. In addition, if any files are being dragged, then one of
- the types will be the string "<code title="">Files</code>".</p>
+ <p>Returns an array listing the formats that were set in the <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code> event. In addition, if
+ any files are being dragged, then one of the types will be the
+ string "<code title="">Files</code>".</p>
</dd>
@@ -835,8 +835,13 @@
during the <code title="event-dragenter"><a href="#event-dragenter">dragenter</a></code> and <code title="event-dragover"><a href="#event-dragover">dragover</a></code> events. When the
<code><a href="#datatransfer">DataTransfer</a></code> object is created, the <code title="dom-DataTransfer-effectAllowed"><a href="#dom-datatransfer-effectallowed">effectAllowed</a></code>
attribute is set to a string value. On getting, it must return its
- current value. On setting, if the new value is one of "<code title="">none</code>", "<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">link</code>", "<code title="">linkMove</code>", "<code title="">move</code>", "<code title="">all</code>", or "<code title="">uninitialized</code>", then the attribute's current value
- must be set to the new value. Other values must be ignored.</p>
+ current value. On setting, if <a href="#drag-data-store">drag data store</a>'s <a href="#drag-data-store-mode" title="drag data store mode">mode</a> is the <a href="#concept-dnd-rw" title="concept-dnd-rw">read/write mode</a> and the new value is
+ one of "<code title="">none</code>", "<code title="">copy</code>",
+ "<code title="">copyLink</code>", "<code title="">copyMove</code>",
+ "<code title="">link</code>", "<code title="">linkMove</code>",
+ "<code title="">move</code>", "<code title="">all</code>", or "<code title="">uninitialized</code>", then the attribute's current value
+ must be set to the new value. Otherwise it must be left
+ unchanged.</p>
<p>The <dfn id="dom-datatransfer-items" title="dom-DataTransfer-items"><code>items</code></dfn>
attribute must return a <code><a href="#datatransferitemlist">DataTransferItemList</a></code> object
@@ -851,7 +856,7 @@
Nothing happens.</p></li>
<li><p>If the <a href="#drag-data-store">drag data store</a>'s <a href="#drag-data-store-mode" title="drag data
- store mode">mode</a> is not in the <a href="#concept-dnd-rw" title="concept-dnd-rw">read/write mode</a>, abort these steps.
+ store mode">mode</a> is not the <a href="#concept-dnd-rw" title="concept-dnd-rw">read/write mode</a>, abort these steps.
Nothing happens.</p></li>
<li><p>If the <var title="">element</var> argument is an
@@ -889,16 +894,15 @@
image at the time the method is invoked.</p>
<p>The <dfn id="dom-datatransfer-types" title="dom-DataTransfer-types"><code>types</code></dfn>
- attribute must return a <a href="infrastructure.html#live">live</a> <code><a href="infrastructure.html#domstringlist">DOMStringList</a></code>
- giving the strings that the following steps would produce. The same
- object must be returned each time.</p>
+ attribute must return a <a href="infrastructure.html#live">live</a> <a href="infrastructure.html#dfn-read-only-array" title="dfn-read-only-array">read only</a> array giving the
+ strings that the following steps would produce. The same object must
+ be returned each time.</p>
<ol><li><p>Start with an empty list <var title="">L</var>.</p></li>
<li><p>If the <code><a href="#datatransfer">DataTransfer</a></code> object is no longer
- associated with a <a href="#drag-data-store">drag data store</a>, the
- <code><a href="infrastructure.html#domstringlist">DOMStringList</a></code> is empty. Abort these steps; return the
- empty list <var title="">L</var>.</p></li>
+ associated with a <a href="#drag-data-store">drag data store</a>, the array is empty.
+ Abort these steps; return the empty list <var title="">L</var>.</p></li>
<li><p>For each item in the <a href="#drag-data-store-item-list">drag data store item list</a>
<!-- in some order...? --> whose <a href="#the-drag-data-item-kind" title="the drag data item
@@ -925,7 +929,7 @@
string and abort these steps.</p></li>
<li><p>If the <a href="#drag-data-store">drag data store</a>'s <a href="#drag-data-store-mode" title="drag data
- store mode">mode</a> is in the <a href="#concept-dnd-p" title="concept-dnd-p">protected mode</a>, return the empty
+ store mode">mode</a> is the <a href="#concept-dnd-p" title="concept-dnd-p">protected mode</a>, return the empty
string and abort these steps.</p></li>
<li><p>Let <var title="">format</var> be the first argument,
@@ -1041,7 +1045,7 @@
empty list <var title="">L</var>.</p></li>
<li><p>If the <a href="#drag-data-store">drag data store</a>'s <a href="#drag-data-store-mode" title="drag data
- store mode">mode</a> is in the <a href="#concept-dnd-p" title="concept-dnd-p">protected mode</a>, abort these steps;
+ store mode">mode</a> is the <a href="#concept-dnd-p" title="concept-dnd-p">protected mode</a>, abort these steps;
return the empty list <var title="">L</var>.</p></li>
<li><p>For each item in the <a href="#drag-data-store-item-list">drag data store item list</a>
@@ -1570,21 +1574,41 @@
<th><code title="dom-DataTransfer-dropEffect"><a href="#dom-datatransfer-dropeffect">dropEffect</a></code></th>
</tr></thead><tr><td>"<code title="">none</code>"</td>
<td>"<code title="">none</code>"</td>
- </tr><tr><td>"<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">all</code>"</td>
+ </tr><tr><td>"<code title="">copy</code>"</td>
<td>"<code title="">copy</code>"</td>
- </tr><tr><td>"<code title="">link</code>", "<code title="">linkMove</code>"</td>
+ </tr><tr><td>"<code title="">copyLink</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, "<code title="">link</code>"</td>
+ </tr><tr><td>"<code title="">copyMove</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, "<code title="">move</code>"</td>
+ </tr><tr><td>"<code title="">all</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
+ </tr><tr><td>"<code title="">link</code>"</td>
<td>"<code title="">link</code>"</td>
+ </tr><tr><td>"<code title="">linkMove</code>"</td>
+ <td>"<code title="">link</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, "<code title="">move</code>"</td>
</tr><tr><td>"<code title="">move</code>"</td>
<td>"<code title="">move</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is a selection from a text field</td>
- <td>"<code title="">move</code>"</td>
+ <td>"<code title="">move</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, either "<code title="">copy</code>" or "<code title="">link</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is a selection</td>
- <td>"<code title="">copy</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is an <code><a href="the-a-element.html#the-a-element">a</a></code> element with an <code>href</code> attribute</td>
- <td>"<code title="">link</code>"</td>
+ <td>"<code title="">link</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, either "<code title="">copy</code>" or "<code title="">move</code>"</td>
</tr><tr><td>Any other case</td>
- <td>"<code title="">copy</code>"</td>
- </tr></table></li>
+ <td>"<code title="">copy</code>", or, <a href="#concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
+ </tr></table><p>Where the table above provides <dfn id="concept-platform-dropeffect-override" title="concept-platform-dropEffect-override">possibly appropriate
+ alternatives</dfn>, user agents may instead use the listed
+ alternative values if platform conventions dictate that the user
+ has requested those alternate effects.</p>
+
+ <p class="example">For example, Windows platform conventions are
+ such that dragging while holding the "alt" key indicates a
+ preference for linking the data, rather than moving or copying it.
+ Therefore, on a Windows system, if "<code title="">link</code>" is
+ an option according to the table above while the "alt" key is
+ depressed, the user agent could select that instead of "<code title="">copy</code>" or "<code title="">move</code>.</p>
+
+ </li>
<li>
@@ -1612,7 +1636,8 @@
<li><p>Set the <a href="#drag-data-store-allowed-effects-state">drag data store allowed effects state</a>
to the current value of <var title="">dataTransfer</var>'s <code title="dom-DataTransfer-effectAllowed"><a href="#dom-datatransfer-effectallowed">effectAllowed</a></code>
- attribute.</p></li>
+ attribute. (It can only have changed value if <var title="">e</var>
+ is <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code>.)</p></li>
<li><p>Set the <a href="#drag-data-store-mode">drag data store mode</a> back to the <a href="#concept-dnd-p" title="concept-dnd-p">protected mode</a> if it was changed in
the first step.</p></li>
@@ -1748,6 +1773,9 @@
strings</a> must be <a href="infrastructure.html#converted-to-ascii-lowercase">converted to ASCII
lowercase</a>.</p>
+ <p>User agents may also add one or more items representing the
+ selection or dragged element(s) in other forms, e.g. as HTML.</p>
+
</li>
<!-- DND-v2: text/html as an export format -->
@@ -1983,6 +2011,24 @@
<a href="#immediate-user-selection">immediate user selection</a> anyway.</p></dd>
+ <dt>If the <a href="#current-target-element">current target element</a> is an element
+ that itself has an ancestor element with a <code title="attr-dropzone"><a href="#the-dropzone-attribute">dropzone</a></code> attribute that <a href="#concept-dropzone-match" title="concept-dropzone-match">matches</a> the <a href="#drag-data-store">drag
+ data store</a></dt>
+
+ <dd>
+
+ <p>Let <var title="">new target</var> be the nearest
+ (deepest) such ancestor element.</p>
+
+ <p>If the <a href="#current-target-element">current target element</a> is <var title="">new target</var>, then leave the <a href="#current-target-element">current
+ target element</a> unchanged.</p>
+
+ <p>Otherwise, <a href="#fire-a-dnd-event">fire a DND event</a> named <code title="event-dragenter"><a href="#event-dragenter">dragenter</a></code> at <var title="">new target</var>. Then, set the <a href="#current-target-element">current
+ target element</a> to <var title="">new target</var>
+
+ </p></dd>
+
+
<dt>If the <a href="#current-target-element">current target element</a> is
<a href="dom.html#the-body-element-0">the body element</a></dt>
@@ -1996,12 +2042,14 @@
<p><a href="#fire-a-dnd-event">Fire a DND event</a> named <code title="event-dragenter"><a href="#event-dragenter">dragenter</a></code> at <a href="dom.html#the-body-element-0">the body
element</a>, if there is one, or at the
- <code><a href="dom.html#document">Document</a></code> object, if not. Then, and set the
+ <code><a href="dom.html#document">Document</a></code> object, if not. Then, set the
<a href="#current-target-element">current target element</a> to <a href="dom.html#the-body-element-0">the body
element</a>, regardless of whether that event was
canceled or not.</p>
- </dd></dl></dd>
+ </dd>
+
+ </dl></dd>
</dl></li>
@@ -2202,22 +2250,16 @@
default action of the <code title="event-dragend"><a href="#event-dragend">dragend</a></code>
event:</p>
- <dl class="switch"><dt>If <var title="">dropped</var> is true, and the
- <a href="#current-target-element">current target element</a> is a text field (e.g.
- <code><a href="the-textarea-element.html#the-textarea-element">textarea</a></code>, or an <code><a href="the-input-element.html#the-input-element">input</a></code> element whose
- <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the
- <a href="states-of-the-type-attribute.html#text-(type=text)-state-and-search-state-(type=search)" title="attr-input-type-text">Text</a> state), and the
+ <dl class="switch"><dt>If <var title="">dropped</var> is true, the <a href="#current-target-element">current
+ target element</a> is a <i>text field</i> (see below), the
<a href="#current-drag-operation">current drag operation</a> is "<code title="">move</code>", and the source of the drag-and-drop
- operation is a selection in the DOM</dt>
+ operation is a selection in the DOM that is entirely contained
+ within an <a href="editing-apis.html#editing-host">editing host</a></dt>
- <dd><p>The user agent should delete the range representing the
- dragged selection from the DOM.</p></dd>
+ <dd><p><a href="editing-apis.html#delete-the-selection">Delete the selection</a>.</p></dd>
- <dt>If <var title="">dropped</var> is true, and the
- <a href="#current-target-element">current target element</a> is a text field (e.g.
- <code><a href="the-textarea-element.html#the-textarea-element">textarea</a></code>, or an <code><a href="the-input-element.html#the-input-element">input</a></code> element whose
- <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the
- <a href="states-of-the-type-attribute.html#text-(type=text)-state-and-search-state-(type=search)" title="attr-input-type-text">Text</a> state), and the
+ <dt>If <var title="">dropped</var> is true, the <a href="#current-target-element">current
+ target element</a> is a <i>text field</i> (see below), the
<a href="#current-drag-operation">current drag operation</a> is "<code title="">move</code>", and the source of the drag-and-drop
operation is a selection in a text field</dt>
@@ -2236,7 +2278,21 @@
<dd><p>The event has no default action.</p></dd>
- </dl></li>
+ </dl><p>For the purposes of this step, a <i>text field</i> is a
+ <code><a href="the-textarea-element.html#the-textarea-element">textarea</a></code> element or an <code><a href="the-input-element.html#the-input-element">input</a></code> element
+ whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in
+ one of the
+ <a href="states-of-the-type-attribute.html#text-(type=text)-state-and-search-state-(type=search)" title="attr-input-type-text">Text</a>,
+ <a href="states-of-the-type-attribute.html#text-(type=text)-state-and-search-state-(type=search)" title="attr-input-type-search">Search</a>,
+ <a href="states-of-the-type-attribute.html#telephone-state-(type=tel)" title="attr-input-type-tel">Tel</a>,
+ <a href="states-of-the-type-attribute.html#url-state-(type=url)" title="attr-input-type-url">URL</a>,
+ <a href="states-of-the-type-attribute.html#e-mail-state-(type=email)" title="attr-input-type-email">E-mail</a>,
+ <a href="states-of-the-type-attribute.html#password-state-(type=password)" title="attr-input-type-password">Password</a>, or
+ <a href="states-of-the-type-attribute.html#number-state-(type=number)" title="attr-input-type-number">Number</a>
+ states.</p>
+
+
+ </li>
</ol></li>
@@ -2327,9 +2383,7 @@
<td>Varies</td>
</tr></tbody></table><p>Not shown in the above table: all these events bubble, and the
<code title="dom-DataTransfer-effectAllowed"><a href="#dom-datatransfer-effectallowed">effectAllowed</a></code>
- attribute always has the value it had after the previous event was
- fired, defaulting to "<code title="">uninitialized</code>" in the
- <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code> event.</p>
+ attribute always has the value it had after the <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code> event, defaulting to "<code title="">uninitialized</code>" in the <code title="event-dragstart"><a href="#event-dragstart">dragstart</a></code> event.</p>
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- single-page.html 7 Sep 2012 11:14:06 -0000 1.95
+++ single-page.html 7 Sep 2012 11:43:45 -0000 1.96
@@ -3609,7 +3609,6 @@
<li><dfn id=htmlcollection><code>HTMLCollection</code></dfn> interface, and the terms <dfn id=collections-0>collections</dfn> and <dfn id=represented-by-the-collection>represented by the collection</dfn></li>
- <li><dfn id=domstringlist><code>DOMStringList</code></dfn> interface</li>
<li><dfn id=domtokenlist><code>DOMTokenList</code></dfn> interface</li>
<li><dfn id=domsettabletokenlist><code>DOMSettableTokenList</code></dfn> interface</li>
@@ -65021,10 +65020,10 @@
<dfn id=dom-document-querycommandsupported title=dom-document-queryCommandSupported><code>queryCommandSupported()</code></dfn>, and
<dfn id=dom-document-querycommandvalue title=dom-document-queryCommandValue><code>queryCommandValue()</code></dfn>
- methods, and text selections are defined in the HTML Editing APIs
- specification. The interaction of editing and the undo/redo features
- in user agents is defined by the UndoManager and DOM Transaction
- specification. <a href=#refsEDITING>[EDITING]</a> <a href=#refsUNDO>[UNDO]</a></p>
+ methods, text selections, and the <dfn id=delete-the-selection>delete the selection</dfn>
+ algorithm are defined in the HTML Editing APIs specification. The
+ interaction of editing and the undo/redo features in user agents is
+ defined by the UndoManager and DOM Transaction specification. <a href=#refsEDITING>[EDITING]</a> <a href=#refsUNDO>[UNDO]</a></p>
<!-- those might get merged in here eventually -->
@@ -65589,7 +65588,7 @@
void <a href=#dom-datatransfer-addelement title=dom-DataTransfer-addElement>addElement</a>(Element element);
/* old interface */
- readonly attribute <a href=#domstringlist>DOMStringList</a> <a href=#dom-datatransfer-types title=dom-DataTransfer-types>types</a>;
+ readonly attribute <span>DOMString</span>[] <a href=#dom-datatransfer-types title=dom-DataTransfer-types>types</a>;
DOMString <a href=#dom-datatransfer-getdata title=dom-DataTransfer-getData>getData</a>(DOMString format);
void <a href=#dom-datatransfer-setdata title=dom-DataTransfer-setData>setData</a>(DOMString format, DOMString data);
void <a href=#dom-datatransfer-cleardata title=dom-DataTransfer-clearData>clearData</a>(optional DOMString format);
@@ -65618,7 +65617,8 @@
<p>Returns the kinds of operations that are to be allowed.</p>
- <p>Can be set, to change the allowed operations.</p>
+ <p>Can be set (during the <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code> event), to change the
+ allowed operations.</p>
<p>The possible values are "<code title="">none</code>", "<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">link</code>", "<code title="">linkMove</code>", "<code title="">move</code>", "<code title="">all</code>", and "<code title="">uninitialized</code>",</p>
@@ -65656,10 +65656,9 @@
<dd>
- <p>Returns a <code><a href=#domstringlist>DOMStringList</a></code> listing the formats that
- were set in the <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code>
- event. In addition, if any files are being dragged, then one of
- the types will be the string "<code title="">Files</code>".</p>
+ <p>Returns an array listing the formats that were set in the <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code> event. In addition, if
+ any files are being dragged, then one of the types will be the
+ string "<code title="">Files</code>".</p>
</dd>
@@ -65724,8 +65723,13 @@
during the <code title=event-dragenter><a href=#event-dragenter>dragenter</a></code> and <code title=event-dragover><a href=#event-dragover>dragover</a></code> events. When the
<code><a href=#datatransfer>DataTransfer</a></code> object is created, the <code title=dom-DataTransfer-effectAllowed><a href=#dom-datatransfer-effectallowed>effectAllowed</a></code>
attribute is set to a string value. On getting, it must return its
- current value. On setting, if the new value is one of "<code title="">none</code>", "<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">link</code>", "<code title="">linkMove</code>", "<code title="">move</code>", "<code title="">all</code>", or "<code title="">uninitialized</code>", then the attribute's current value
- must be set to the new value. Other values must be ignored.</p>
+ current value. On setting, if <a href=#drag-data-store>drag data store</a>'s <a href=#drag-data-store-mode title="drag data store mode">mode</a> is the <a href=#concept-dnd-rw title=concept-dnd-rw>read/write mode</a> and the new value is
+ one of "<code title="">none</code>", "<code title="">copy</code>",
+ "<code title="">copyLink</code>", "<code title="">copyMove</code>",
+ "<code title="">link</code>", "<code title="">linkMove</code>",
+ "<code title="">move</code>", "<code title="">all</code>", or "<code title="">uninitialized</code>", then the attribute's current value
+ must be set to the new value. Otherwise it must be left
+ unchanged.</p>
<p>The <dfn id=dom-datatransfer-items title=dom-DataTransfer-items><code>items</code></dfn>
attribute must return a <code><a href=#datatransferitemlist>DataTransferItemList</a></code> object
@@ -65740,7 +65744,7 @@
Nothing happens.</p></li>
<li><p>If the <a href=#drag-data-store>drag data store</a>'s <a href=#drag-data-store-mode title="drag data
- store mode">mode</a> is not in the <a href=#concept-dnd-rw title=concept-dnd-rw>read/write mode</a>, abort these steps.
+ store mode">mode</a> is not the <a href=#concept-dnd-rw title=concept-dnd-rw>read/write mode</a>, abort these steps.
Nothing happens.</p></li>
<li><p>If the <var title="">element</var> argument is an
@@ -65778,16 +65782,15 @@
image at the time the method is invoked.</p>
<p>The <dfn id=dom-datatransfer-types title=dom-DataTransfer-types><code>types</code></dfn>
- attribute must return a <a href=#live>live</a> <code><a href=#domstringlist>DOMStringList</a></code>
- giving the strings that the following steps would produce. The same
- object must be returned each time.</p>
+ attribute must return a <a href=#live>live</a> <a href=#dfn-read-only-array title=dfn-read-only-array>read only</a> array giving the
+ strings that the following steps would produce. The same object must
+ be returned each time.</p>
<ol><li><p>Start with an empty list <var title="">L</var>.</p></li>
<li><p>If the <code><a href=#datatransfer>DataTransfer</a></code> object is no longer
- associated with a <a href=#drag-data-store>drag data store</a>, the
- <code><a href=#domstringlist>DOMStringList</a></code> is empty. Abort these steps; return the
- empty list <var title="">L</var>.</p></li>
+ associated with a <a href=#drag-data-store>drag data store</a>, the array is empty.
+ Abort these steps; return the empty list <var title="">L</var>.</p></li>
<li><p>For each item in the <a href=#drag-data-store-item-list>drag data store item list</a>
<!-- in some order...? --> whose <a href=#the-drag-data-item-kind title="the drag data item
@@ -65814,7 +65817,7 @@
string and abort these steps.</p></li>
<li><p>If the <a href=#drag-data-store>drag data store</a>'s <a href=#drag-data-store-mode title="drag data
- store mode">mode</a> is in the <a href=#concept-dnd-p title=concept-dnd-p>protected mode</a>, return the empty
+ store mode">mode</a> is the <a href=#concept-dnd-p title=concept-dnd-p>protected mode</a>, return the empty
string and abort these steps.</p></li>
<li><p>Let <var title="">format</var> be the first argument,
@@ -65930,7 +65933,7 @@
empty list <var title="">L</var>.</p></li>
<li><p>If the <a href=#drag-data-store>drag data store</a>'s <a href=#drag-data-store-mode title="drag data
- store mode">mode</a> is in the <a href=#concept-dnd-p title=concept-dnd-p>protected mode</a>, abort these steps;
+ store mode">mode</a> is the <a href=#concept-dnd-p title=concept-dnd-p>protected mode</a>, abort these steps;
return the empty list <var title="">L</var>.</p></li>
<li><p>For each item in the <a href=#drag-data-store-item-list>drag data store item list</a>
@@ -66459,21 +66462,41 @@
<th><code title=dom-DataTransfer-dropEffect><a href=#dom-datatransfer-dropeffect>dropEffect</a></code></th>
</tr></thead><tr><td>"<code title="">none</code>"</td>
<td>"<code title="">none</code>"</td>
- </tr><tr><td>"<code title="">copy</code>", "<code title="">copyLink</code>", "<code title="">copyMove</code>", "<code title="">all</code>"</td>
+ </tr><tr><td>"<code title="">copy</code>"</td>
<td>"<code title="">copy</code>"</td>
- </tr><tr><td>"<code title="">link</code>", "<code title="">linkMove</code>"</td>
+ </tr><tr><td>"<code title="">copyLink</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, "<code title="">link</code>"</td>
+ </tr><tr><td>"<code title="">copyMove</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, "<code title="">move</code>"</td>
+ </tr><tr><td>"<code title="">all</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
+ </tr><tr><td>"<code title="">link</code>"</td>
<td>"<code title="">link</code>"</td>
+ </tr><tr><td>"<code title="">linkMove</code>"</td>
+ <td>"<code title="">link</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, "<code title="">move</code>"</td>
</tr><tr><td>"<code title="">move</code>"</td>
<td>"<code title="">move</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is a selection from a text field</td>
- <td>"<code title="">move</code>"</td>
+ <td>"<code title="">move</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, either "<code title="">copy</code>" or "<code title="">link</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is a selection</td>
- <td>"<code title="">copy</code>"</td>
+ <td>"<code title="">copy</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
</tr><tr><td>"<code title="">uninitialized</code>" when what is being dragged is an <code><a href=#the-a-element>a</a></code> element with an <code>href</code> attribute</td>
- <td>"<code title="">link</code>"</td>
+ <td>"<code title="">link</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, either "<code title="">copy</code>" or "<code title="">move</code>"</td>
</tr><tr><td>Any other case</td>
- <td>"<code title="">copy</code>"</td>
- </tr></table></li>
+ <td>"<code title="">copy</code>", or, <a href=#concept-platform-dropeffect-override title=concept-platform-dropEffect-override>if appropriate</a>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
+ </tr></table><p>Where the table above provides <dfn id=concept-platform-dropeffect-override title=concept-platform-dropEffect-override>possibly appropriate
+ alternatives</dfn>, user agents may instead use the listed
+ alternative values if platform conventions dictate that the user
+ has requested those alternate effects.</p>
+
+ <p class=example>For example, Windows platform conventions are
+ such that dragging while holding the "alt" key indicates a
+ preference for linking the data, rather than moving or copying it.
+ Therefore, on a Windows system, if "<code title="">link</code>" is
+ an option according to the table above while the "alt" key is
+ depressed, the user agent could select that instead of "<code title="">copy</code>" or "<code title="">move</code>.</p>
+
+ </li>
<li>
@@ -66501,7 +66524,8 @@
<li><p>Set the <a href=#drag-data-store-allowed-effects-state>drag data store allowed effects state</a>
to the current value of <var title="">dataTransfer</var>'s <code title=dom-DataTransfer-effectAllowed><a href=#dom-datatransfer-effectallowed>effectAllowed</a></code>
- attribute.</p></li>
+ attribute. (It can only have changed value if <var title="">e</var>
+ is <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code>.)</p></li>
<li><p>Set the <a href=#drag-data-store-mode>drag data store mode</a> back to the <a href=#concept-dnd-p title=concept-dnd-p>protected mode</a> if it was changed in
the first step.</p></li>
@@ -66637,6 +66661,9 @@
strings</a> must be <a href=#converted-to-ascii-lowercase>converted to ASCII
lowercase</a>.</p>
+ <p>User agents may also add one or more items representing the
+ selection or dragged element(s) in other forms, e.g. as HTML.</p>
+
</li>
<!-- DND-v2: text/html as an export format -->
@@ -66872,6 +66899,24 @@
<a href=#immediate-user-selection>immediate user selection</a> anyway.</p></dd>
+ <dt>If the <a href=#current-target-element>current target element</a> is an element
+ that itself has an ancestor element with a <code title=attr-dropzone><a href=#the-dropzone-attribute>dropzone</a></code> attribute that <a href=#concept-dropzone-match title=concept-dropzone-match>matches</a> the <a href=#drag-data-store>drag
+ data store</a></dt>
+
+ <dd>
+
+ <p>Let <var title="">new target</var> be the nearest
+ (deepest) such ancestor element.</p>
+
+ <p>If the <a href=#current-target-element>current target element</a> is <var title="">new target</var>, then leave the <a href=#current-target-element>current
+ target element</a> unchanged.</p>
+
+ <p>Otherwise, <a href=#fire-a-dnd-event>fire a DND event</a> named <code title=event-dragenter><a href=#event-dragenter>dragenter</a></code> at <var title="">new target</var>. Then, set the <a href=#current-target-element>current
+ target element</a> to <var title="">new target</var>
+
+ </p></dd>
+
+
<dt>If the <a href=#current-target-element>current target element</a> is
<a href=#the-body-element-0>the body element</a></dt>
@@ -66885,12 +66930,14 @@
<p><a href=#fire-a-dnd-event>Fire a DND event</a> named <code title=event-dragenter><a href=#event-dragenter>dragenter</a></code> at <a href=#the-body-element-0>the body
element</a>, if there is one, or at the
- <code><a href=#document>Document</a></code> object, if not. Then, and set the
+ <code><a href=#document>Document</a></code> object, if not. Then, set the
<a href=#current-target-element>current target element</a> to <a href=#the-body-element-0>the body
element</a>, regardless of whether that event was
canceled or not.</p>
- </dd></dl></dd>
+ </dd>
+
+ </dl></dd>
</dl></li>
@@ -67091,22 +67138,16 @@
default action of the <code title=event-dragend><a href=#event-dragend>dragend</a></code>
event:</p>
- <dl class=switch><dt>If <var title="">dropped</var> is true, and the
- <a href=#current-target-element>current target element</a> is a text field (e.g.
- <code><a href=#the-textarea-element>textarea</a></code>, or an <code><a href=#the-input-element>input</a></code> element whose
- <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in the
- <a href="#text-(type=text)-state-and-search-state-(type=search)" title=attr-input-type-text>Text</a> state), and the
+ <dl class=switch><dt>If <var title="">dropped</var> is true, the <a href=#current-target-element>current
+ target element</a> is a <i>text field</i> (see below), the
<a href=#current-drag-operation>current drag operation</a> is "<code title="">move</code>", and the source of the drag-and-drop
- operation is a selection in the DOM</dt>
+ operation is a selection in the DOM that is entirely contained
+ within an <a href=#editing-host>editing host</a></dt>
- <dd><p>The user agent should delete the range representing the
- dragged selection from the DOM.</p></dd>
+ <dd><p><a href=#delete-the-selection>Delete the selection</a>.</p></dd>
- <dt>If <var title="">dropped</var> is true, and the
- <a href=#current-target-element>current target element</a> is a text field (e.g.
- <code><a href=#the-textarea-element>textarea</a></code>, or an <code><a href=#the-input-element>input</a></code> element whose
- <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in the
- <a href="#text-(type=text)-state-and-search-state-(type=search)" title=attr-input-type-text>Text</a> state), and the
+ <dt>If <var title="">dropped</var> is true, the <a href=#current-target-element>current
+ target element</a> is a <i>text field</i> (see below), the
<a href=#current-drag-operation>current drag operation</a> is "<code title="">move</code>", and the source of the drag-and-drop
operation is a selection in a text field</dt>
@@ -67125,7 +67166,21 @@
<dd><p>The event has no default action.</p></dd>
- </dl></li>
+ </dl><p>For the purposes of this step, a <i>text field</i> is a
+ <code><a href=#the-textarea-element>textarea</a></code> element or an <code><a href=#the-input-element>input</a></code> element
+ whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in
+ one of the
+ <a href="#text-(type=text)-state-and-search-state-(type=search)" title=attr-input-type-text>Text</a>,
+ <a href="#text-(type=text)-state-and-search-state-(type=search)" title=attr-input-type-search>Search</a>,
+ <a href="#telephone-state-(type=tel)" title=attr-input-type-tel>Tel</a>,
+ <a href="#url-state-(type=url)" title=attr-input-type-url>URL</a>,
+ <a href="#e-mail-state-(type=email)" title=attr-input-type-email>E-mail</a>,
+ <a href="#password-state-(type=password)" title=attr-input-type-password>Password</a>, or
+ <a href="#number-state-(type=number)" title=attr-input-type-number>Number</a>
+ states.</p>
+
+
+ </li>
</ol></li>
@@ -67216,9 +67271,7 @@
<td>Varies</td>
</tr></tbody></table><p>Not shown in the above table: all these events bubble, and the
<code title=dom-DataTransfer-effectAllowed><a href=#dom-datatransfer-effectallowed>effectAllowed</a></code>
- attribute always has the value it had after the previous event was
- fired, defaulting to "<code title="">uninitialized</code>" in the
- <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code> event.</p>
+ attribute always has the value it had after the <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code> event, defaulting to "<code title="">uninitialized</code>" in the <code title=event-dragstart><a href=#event-dragstart>dragstart</a></code> event.</p>
Index: editing-apis.html
===================================================================
RCS file: /sources/public/html5/spec/editing-apis.html,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- editing-apis.html 7 Sep 2012 00:13:57 -0000 1.170
+++ editing-apis.html 7 Sep 2012 11:43:45 -0000 1.171
@@ -347,10 +347,10 @@
<dfn id="dom-document-querycommandsupported" title="dom-document-queryCommandSupported"><code>queryCommandSupported()</code></dfn>, and
<dfn id="dom-document-querycommandvalue" title="dom-document-queryCommandValue"><code>queryCommandValue()</code></dfn>
- methods, and text selections are defined in the HTML Editing APIs
- specification. The interaction of editing and the undo/redo features
- in user agents is defined by the UndoManager and DOM Transaction
- specification. <a href="references.html#refsEDITING">[EDITING]</a> <a href="references.html#refsUNDO">[UNDO]</a></p>
+ methods, text selections, and the <dfn id="delete-the-selection">delete the selection</dfn>
+ algorithm are defined in the HTML Editing APIs specification. The
+ interaction of editing and the undo/redo features in user agents is
+ defined by the UndoManager and DOM Transaction specification. <a href="references.html#refsEDITING">[EDITING]</a> <a href="references.html#refsUNDO">[UNDO]</a></p>
<!-- those might get merged in here eventually -->
Received on Friday, 7 September 2012 11:43:55 UTC