- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 04 Nov 2011 17:46:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv5040
Modified Files:
content-models.html editing.html spec.html
Log Message:
Change how nested clicks are prevented to also prevent click() inside a regular onclick=''. (part 2) (whatwg r6818)
[updated by splitter]
Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.1061
retrieving revision 1.1062
diff -u -d -r1.1061 -r1.1062
--- editing.html 27 Oct 2011 21:46:24 -0000 1.1061
+++ editing.html 4 Nov 2011 17:46:25 -0000 1.1062
@@ -406,27 +406,11 @@
</dl><div class="impl">
- <p>Each element has a <var title="">click in progress</var> flag,
- initially set to false.</p>
-
<p>The <dfn id="dom-click" title="dom-click"><code>click()</code></dfn> method must
- run these steps:</p>
-
- <ol><li><p>If the element's <var title="">click in progress</var> flag
- is set to true, then abort these steps.</p></li>
-
- <li><p>Set the <var title="">click in progress</var> flag on the
- element to true.</p></li>
-
- <li><p>If the element has a defined <a href="content-models.html#activation-behavior">activation behavior</a>,
- <a href="content-models.html#run-synthetic-click-activation-steps">run synthetic click activation steps</a> on the
- element. Otherwise, <a href="webappapis.html#fire-a-click-event">fire a <code>click</code> event</a> at
- the element.</p></li>
-
- <li><p>Set the <var title="">click in progress</var> flag on the
- element to false.</p></li>
+ <a href="content-models.html#run-synthetic-click-activation-steps">run synthetic click activation steps</a> on the
+ element.</p>
- </ol></div><h3 id="focus"><span class="secno">7.3 </span>Focus</h3><div class="impl">
+ </div><h3 id="focus"><span class="secno">7.3 </span>Focus</h3><div class="impl">
<p>When an element is <i>focused</i>, key events received by the
document must be targeted at that element. There may be no element
Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- content-models.html 30 Oct 2011 16:46:51 -0000 1.105
+++ content-models.html 4 Nov 2011 17:46:25 -0000 1.106
@@ -654,18 +654,50 @@
interaction event must be to <a href="#run-synthetic-click-activation-steps">run synthetic click activation
steps</a> on the element.</p>
+ <p>Each element has a <var title="">click in progress</var> flag,
+ initially set to false.</p>
+
<p>When a user agent is to <dfn id="run-synthetic-click-activation-steps">run synthetic click activation
- steps</dfn> on an element, the user agent must <a href="#run-pre-click-activation-steps">run pre-click
- activation steps</a> on the element, then <a href="webappapis.html#fire-a-click-event">fire a <code title="event-click">click</code> event</a> at the element. The
- default action of this <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event
- must be to <a href="#run-post-click-activation-steps">run post-click activation steps</a> on the
- element. If the event is canceled, the user agent must <a href="#run-canceled-activation-steps">run
- canceled activation steps</a> on the element instead.</p>
+ steps</dfn> on an element, the user agent must run the following
+ steps:</p>
- <p>When a pointing device is clicked, the user agent must run these
+ <ol><li><p>If the element's <var title="">click in progress</var> flag
+ is set to true, then abort these steps.</p></li>
+
+ <li><p>Set the <var title="">click in progress</var> flag on the
+ element to true.</p></li>
+
+ <li><p><a href="#run-pre-click-activation-steps">Run pre-click activation steps</a> on the
+ element.</p></li>
+
+ <li><p><a href="webappapis.html#fire-a-click-event">Fire a <code title="event-click">click</code>
+ event</a> at the element.</p></li>
+
+ <li>
+
+ <p>If this <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event is not
+ canceled, <a href="#run-post-click-activation-steps">run post-click activation steps</a> on the
+ element.</p>
+
+ <p>If the event <em>is</em> canceled, the user agent must
+ <a href="#run-canceled-activation-steps">run canceled activation steps</a> on the element
+ instead.</p>
+
+ </li>
+
+ <li><p>Set the <var title="">click in progress</var> flag on the
+ element to false.</p></li>
+
+ </ol><p>When a pointing device is clicked, the user agent must run these
steps:</p>
- <ol><li><p>Let <var title="">e</var> be the <a href="#nearest-activatable-element">nearest activatable
+ <ol><li><p>If the element's <var title="">click in progress</var> flag
+ is set to true, then abort these steps.</p></li>
+
+ <li><p>Set the <var title="">click in progress</var> flag on the
+ element to true.</p></li>
+
+ <li><p>Let <var title="">e</var> be the <a href="#nearest-activatable-element">nearest activatable
element</a> of the element designated by the user (defined
below), if any.</p></li>
@@ -677,16 +709,18 @@
<p>Dispatch the required <code title="event-click"><a href="infrastructure.html#event-click">click</a></code>
event.</p>
- <p>If there is an element <var title="">e</var>, then the default
- action of the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event must be
- to <a href="#run-post-click-activation-steps">run post-click activation steps</a> on element <var title="">e</var>.</p>
+ <p>If there is an element <var title="">e</var> and the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event is not canceled, <a href="#run-post-click-activation-steps">run
+ post-click activation steps</a> on element <var title="">e</var>.</p>
- <p>If there is an element <var title="">e</var> but the event is
- canceled, the user agent must <a href="#run-canceled-activation-steps">run canceled activation
- steps</a> on element <var title="">e</var>.</p>
+ <p>If there is an element <var title="">e</var> and the event
+ <em>is</em> canceled, <a href="#run-canceled-activation-steps">run canceled activation steps</a>
+ on element <var title="">e</var>.</p>
</li>
+ <li><p>Set the <var title="">click in progress</var> flag on the
+ element to false.</p></li>
+
</ol><p class="note">The above doesn't happen for arbitrary synthetic
events dispatched by author script. However, the <code title="dom-click"><a href="editing.html#dom-click">click()</a></code> method can be used to make it
happen programmatically.</p>
@@ -721,9 +755,10 @@
<p>When a user agent is to <dfn id="run-post-click-activation-steps">run post-click activation
steps</dfn> on an element, it must run the <dfn id="activation-behavior">activation
- behavior</dfn> defined for that element. Activation behaviors can
- refer to the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event that was
- fired by the steps above leading up to this point.</p>
+ behavior</dfn> defined for that element, if any. Activation
+ behaviors can refer to the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code>
+ event that was fired by the steps above leading up to this
+ point.</p>
</div><h6 id="palpable-content-0"><span class="secno">3.2.5.1.8 </span>Palpable content</h6><p>As a general rule, elements whose content model allows any
<a href="#flow-content">flow content</a> or <a href="#phrasing-content">phrasing content</a> should
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1775
retrieving revision 1.1776
diff -u -d -r1.1775 -r1.1776
--- spec.html 3 Nov 2011 21:46:27 -0000 1.1775
+++ spec.html 4 Nov 2011 17:46:25 -0000 1.1776
@@ -324,7 +324,7 @@
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-3-november-2011">Editor's Draft 3 November 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-4-november-2011">Editor's Draft 4 November 2011</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -349,7 +349,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">web developer edition</a>.
-This is revision 1.5451.
+This is revision 1.5453.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2011 <a href="http://www.w3.org/"><abbr title="World Wide
@@ -470,7 +470,7 @@
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
track.
- This specification is the 3 November 2011 Editor's Draft.
+ This specification is the 4 November 2011 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Received on Friday, 4 November 2011 17:46:34 UTC