Skip to content

Commit

Permalink
[e] (0) Change the variable name 'dialog' to 'subject' to avoid confu…
Browse files Browse the repository at this point in the history 
…sion. WARNING: THIS IS A RISKY CHANGE. (If anyone can carefully proof-read this diff that would be fantastic.)

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=20969
Affected topics: DOM APIs, HTML

git-svn-id: http://svn.whatwg.org/webapps@7831 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Apr 14, 2013
1 parent 2ffa20c commit 22468cc
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 79 deletions.
52 changes: 26 additions & 26 deletions complete.html
View file
Expand Up @@ -54991,7 +54991,7 @@ <h5 id=form-submission-algorithm><span class=secno>4.10.22.3 </span>Form submiss
<dt><dfn id=submit-dialog title=submit-dialog>Submit dialog</dfn>
<dd>

<p>Let <var title="">dialog</var> be the nearest ancestor <code><a href=#the-dialog-element>dialog</a></code> element of <var title="">form</var>, if any.</p>
<p>Let <var title="">subject</var> be the nearest ancestor <code><a href=#the-dialog-element>dialog</a></code> element of <var title="">form</var>, if any.</p>

<p>If there isn't one, do nothing. Otherwise, proceed as follows:</p>

Expand All @@ -55004,7 +55004,7 @@ <h5 id=form-submission-algorithm><span class=secno>4.10.22.3 </span>Form submiss

<p>Otherwise, there is no <var title="">result</var>.</p>

<p>Then, <a href=#close-the-dialog>close the dialog</a> <var title="">dialog</var>. If there is a <var title="">result</var>, let that be the return value.</p>
<p>Then, <a href=#close-the-dialog>close the dialog</a> <var title="">subject</var>. If there is a <var title="">result</var>, let that be the return value.</p>

</dd>

Expand Down Expand Up @@ -57115,37 +57115,37 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<
<p>When the <dfn id=dom-dialog-showmodal title=dom-dialog-showModal><code>showModal()</code></dfn> method
is invoked, the user agent must run the following steps:</p>

<ol><li><p>Let <var title="">dialog</var> be the <code><a href=#the-dialog-element>dialog</a></code>
<ol><li><p>Let <var title="">subject</var> be the <code><a href=#the-dialog-element>dialog</a></code>
element on which the method was invoked.</li>

<li><p>If <var title="">dialog</var> already has an <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute, then throw an
<li><p>If <var title="">subject</var> already has an <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute, then throw an
<code><a href=#invalidstateerror>InvalidStateError</a></code> exception and abort these
steps.</li>

<li><p>If <var title="">dialog</var> is not <a href=#in-a-document>in a
<li><p>If <var title="">subject</var> is not <a href=#in-a-document>in a
<code>Document</code></a>, then throw an
<code><a href=#invalidstateerror>InvalidStateError</a></code> exception and abort these
steps.</li>

<li><p>Add an <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute
to <var title="">dialog</var>, whose value is the empty
to <var title="">subject</var>, whose value is the empty
string.</li>

<li><p>If the <code title=dom-dialog-showModal><a href=#dom-dialog-showmodal>showModal()</a></code>
method was invoked with an argument, <a href=#set-up-the-position>set up the
position</a> of <var title="">dialog</var>, using that argument
position</a> of <var title="">subject</var>, using that argument
as the anchor. Otherwise, <a href=#set-up-the-default-static-position>set up the default static
position</a> of the dialog element.</li>

<li><p>Let <var title="">dialog</var>'s <code><a href=#document>Document</a></code> be
<li><p>Let <var title="">subject</var>'s <code><a href=#document>Document</a></code> be
<a href=#blocked-by-a-modal-dialog title="blocked by a modal dialog">blocked by the modal
dialog</a> <var title="">dialog</var>.</li>
dialog</a> <var title="">subject</var>.</li>

<li><p>Push <var title="">dialog</var> onto <var title="">dialog</var>'s <code><a href=#document>Document</a></code>'s <a href=#pending-dialog-stack>pending
<li><p>Push <var title="">subject</var> onto <var title="">subject</var>'s <code><a href=#document>Document</a></code>'s <a href=#pending-dialog-stack>pending
dialog stack</a>.</li>

<li><p>Let <var title="">control</var> be the first element in tree
order whose nearest ancestor <code><a href=#the-dialog-element>dialog</a></code> element is <var title="">dialog</var> and that has an <code title=attr-fe-autofocus><a href=#attr-fe-autofocus>autofocus</a></code> attribute
order whose nearest ancestor <code><a href=#the-dialog-element>dialog</a></code> element is <var title="">subject</var> and that has an <code title=attr-fe-autofocus><a href=#attr-fe-autofocus>autofocus</a></code> attribute
specified, if any.</li>

<li><p>If there is no <var title="">control</var>, then abort these
Expand All @@ -57158,11 +57158,11 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<
that <code><a href=#document>Document</a></code>'s <a href=#pending-dialog-stack>pending dialog stack</a>, the
following steps must be run:</p>

<ol><li><p>Let <var title="">dialog</var> be that <code><a href=#the-dialog-element>dialog</a></code>
<ol><li><p>Let <var title="">subject</var> be that <code><a href=#the-dialog-element>dialog</a></code>
element and <var title="">document</var> be the
<code><a href=#document>Document</a></code> from which it is being removed.</li>

<li><p>Remove <var title="">dialog</var> from <var title="">document</var>'s <a href=#pending-dialog-stack>pending dialog
<li><p>Remove <var title="">subject</var> from <var title="">document</var>'s <a href=#pending-dialog-stack>pending dialog
stack</a>.</li>

<li><p>If <var title="">document</var>'s <a href=#pending-dialog-stack>pending dialog
Expand All @@ -57180,31 +57180,31 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<

<!--TOPIC:HTML-->

<p>When a <code><a href=#the-dialog-element>dialog</a></code> element <var title="">dialog</var> is
<p>When a <code><a href=#the-dialog-element>dialog</a></code> element <var title="">subject</var> is
to be <dfn id=close-the-dialog title="close the dialog">closed</dfn>, optionally with a
return value <var title="">result</var>, the user agent must run the
following steps:</p>

<ol><li><p>If <var title="">dialog</var> does not have an <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute, then throw an
<ol><li><p>If <var title="">subject</var> does not have an <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute, then throw an
<code><a href=#invalidstateerror>InvalidStateError</a></code> exception and abort these
steps.</li>

<li><p>Remove <var title="">dialog</var>'s <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute.</li>
<li><p>Remove <var title="">subject</var>'s <code title=attr-dialog-open><a href=#attr-dialog-open>open</a></code> attribute.</li>

<li><p>If the argument was passed a <var title="">result</var>,
then set the <code title=dom-dialog-returnValue><a href=#dom-dialog-returnvalue>returnValue</a></code> attribute to the
value of <var title="">result</var>.</li>

<li>

<p>If <var title="">dialog</var> is in its <code><a href=#document>Document</a></code>'s
<p>If <var title="">subject</var> is in its <code><a href=#document>Document</a></code>'s
<a href=#pending-dialog-stack>pending dialog stack</a>, then run these substeps:</p>

<ol><li><p>Remove <var title="">dialog</var> from that <a href=#pending-dialog-stack>pending
<ol><li><p>Remove <var title="">subject</var> from that <a href=#pending-dialog-stack>pending
dialog stack</a>.</li>

<li><p>If that <a href=#pending-dialog-stack>pending dialog stack</a> is not empty,
then let <var title="">dialog</var>'s <code><a href=#document>Document</a></code> be
then let <var title="">subject</var>'s <code><a href=#document>Document</a></code> be
<a href=#blocked-by-a-modal-dialog title="blocked by a modal dialog">blocked by the modal
dialog</a> that is at the top of the <a href=#pending-dialog-stack>pending dialog
stack</a>. Otherwise, let <var title="">document</var> be no
Expand All @@ -57213,7 +57213,7 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<
</ol></li>

<li><p><a href=#queue-a-task>Queue a task</a> to <a href=#fire-a-simple-event>fire a simple
event</a> named <dfn id=event-close title=event-close><code>close</code></dfn> at <var title="">dialog</var>.</li>
event</a> named <dfn id=event-close title=event-close><code>close</code></dfn> at <var title="">subject</var>.</li>

</ol><!--TOPIC:DOM APIs--><p>The <dfn id=dom-dialog-returnvalue title=dom-dialog-returnValue><code>returnValue</code></dfn> IDL
attribute, on getting, must return the last value to which it was
Expand All @@ -57234,7 +57234,7 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<
pressing the "Escape" key.</p>

<hr><p>When a user agent is to <dfn id=set-up-the-default-static-position>set up the default static
position</dfn> of an element <var title="">dialog</var> without an
position</dfn> of an element <var title="">subject</var> without an
anchor, it must set up the element such that its top static
position, for the purposes of calculating the used value of the
'top' property, is the value that would place the element's top
Expand All @@ -57258,15 +57258,15 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<
(still without anchors).</p>

<p>When a user agent is to <dfn id=set-up-the-position>set up the position</dfn> of an
element <var title="">dialog</var> using an anchor <var title="">anchor</var>, it must run the following steps:</p>
element <var title="">subject</var> using an anchor <var title="">anchor</var>, it must run the following steps:</p>

<ol><li>

<p>If <var title="">anchor</var> is a <code><a href=#mouseevent>MouseEvent</a></code>
object, then run these substeps:</p>

<ol><li><p>If <var title="">anchor</var>'s target element does not
have a rendered box, or is in a different document than <var title="">dialog</var>, then abort the <a href=#set-up-the-position>set up the
have a rendered box, or is in a different document than <var title="">subject</var>, then abort the <a href=#set-up-the-position>set up the
position</a> steps.</li>

<li><p>Let <var title="">anchor element</var> be an anonymous
Expand All @@ -57280,7 +57280,7 @@ <h4 id=the-dialog-element><span class=secno>4.11.7 </span>The <dfn><code>dialog<

</li>

<li><p>Let <var title="">dialog</var> be <a href=#magically-aligned>magically
<li><p>Let <var title="">subject</var> be <a href=#magically-aligned>magically
aligned</a> to <var title="">anchor element</var>.</li>

</ol><p>While an element <var title="">A</var> is <dfn id=magically-aligned>magically aligned</dfn> to an element <var title="">B</var>, <var title="">A</var> and <var title="">B</var> both have rendered boxes, <var title="">A</var> and <var title="">B</var> are both in the same <code><a href=#document>Document</a></code>, and <var title="">B</var> is earlier than <var title="">A</var> in <a href=#tree-order>tree order</a>, the following
Expand Down Expand Up @@ -74053,9 +74053,9 @@ <h3 id=inert-subtrees><span class=secno>8.2 </span>Inert subtrees</h3>
<a href=#concept-command title=concept-command>command</a>.</p>

<p>An entire <code><a href=#document>Document</a></code> can be marked as <dfn id=blocked-by-a-modal-dialog>blocked by
a modal dialog</dfn> <var title="">dialog</var>. While a
a modal dialog</dfn> <var title="">subject</var>. While a
<code><a href=#document>Document</a></code> is so marked, every node that is <a href=#in-a-document title="in a Document">in the <code>Document</code></a>, with the
exception of the <var title="">dialog</var> element, its ancestors,
exception of the <var title="">subject</var> element, its ancestors,
and its descendants, must be marked <a href=#inert>inert</a>. (The
elements excepted by this paragraph can additionally be marked
<a href=#inert>inert</a> through other means; being part of a modal dialog
Expand Down

0 comments on commit 22468cc

Please sign in to comment.