[html5] r6818 - [giow] (2) Change how nested clicks are prevented to also prevent click() inside [...]

whatwg at whatwg.org whatwg at whatwg.org
Fri Nov 4 10:34:59 PDT 2011


Author: ianh
Date: 2011-11-04 10:34:58 -0700 (Fri, 04 Nov 2011)
New Revision: 6818

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Change how nested clicks are prevented to also prevent click() inside a regular onclick=''. (part 2)
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14427

Modified: complete.html
===================================================================
--- complete.html	2011-11-04 17:26:04 UTC (rev 6817)
+++ complete.html	2011-11-04 17:34:58 UTC (rev 6818)
@@ -11810,7 +11810,13 @@
   </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.</li>
+
+   <li><p>Set the <var title="">click in progress</var> flag on the
+   element to true.</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.</li>
 
@@ -11822,16 +11828,18 @@
     <p>Dispatch the required <code title=event-click><a href=#event-click>click</a></code>
     event.</p> <!-- interaction event spec point -->
 
-    <p>If there is an element <var title="">e</var>, then the default
-    action of the <code title=event-click><a href=#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=#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.</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=#dom-click>click()</a></code> method can be used to make it
   happen programmatically.</p>

Modified: index
===================================================================
--- index	2011-11-04 17:26:04 UTC (rev 6817)
+++ index	2011-11-04 17:34:58 UTC (rev 6818)
@@ -11810,7 +11810,13 @@
   </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.</li>
+
+   <li><p>Set the <var title="">click in progress</var> flag on the
+   element to true.</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.</li>
 
@@ -11822,16 +11828,18 @@
     <p>Dispatch the required <code title=event-click><a href=#event-click>click</a></code>
     event.</p> <!-- interaction event spec point -->
 
-    <p>If there is an element <var title="">e</var>, then the default
-    action of the <code title=event-click><a href=#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=#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.</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=#dom-click>click()</a></code> method can be used to make it
   happen programmatically.</p>

Modified: source
===================================================================
--- source	2011-11-04 17:26:04 UTC (rev 6817)
+++ source	2011-11-04 17:34:58 UTC (rev 6818)
@@ -12204,6 +12204,12 @@
 
   <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 <span>nearest activatable
    element</span> of the element designated by the user (defined
    below), if any.</p></li>
@@ -12216,17 +12222,20 @@
     <p>Dispatch the required <code title="event-click">click</code>
     event.</p> <!-- interaction event spec point -->
 
-    <p>If there is an element <var title="">e</var>, then the default
-    action of the <code title="event-click">click</code> event must be
-    to <span>run post-click activation steps</span> on element <var
+    <p>If there is an element <var title="">e</var> and the <code
+    title="event-click">click</code> event is not canceled, <span>run
+    post-click activation steps</span> 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 <span>run canceled activation
-    steps</span> on element <var title="">e</var>.</p>
+    <p>If there is an element <var title="">e</var> and the event
+    <em>is</em> canceled, <span>run canceled activation steps</span>
+    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




More information about the Commit-Watchers mailing list