Skip to content

Commit

Permalink
[e] (0) Consistency
Browse files Browse the repository at this point in the history 
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=21756
Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@7895 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jun 4, 2013
1 parent d138790 commit 6eb1a51
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 60 deletions.
33 changes: 13 additions & 20 deletions complete.html
View file
Expand Up @@ -25326,8 +25326,7 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
<ol><li>

<p>If the user has indicated a preference that this <code><a href=#the-object-element>object</a></code> element's <a href=#fallback-content>fallback
content</a> be shown instead of the element's usual behavior, then jump to the last step in
the overall set of steps (fallback).</p>
content</a> be shown instead of the element's usual behavior, then jump to the step below labeled <i>fallback</i>.</p>

<p class=note>For example, a user could ask for the element's <a href=#fallback-content>fallback content</a> to
be shown because that content uses a format that the user finds more accessible.</p>
Expand All @@ -25342,7 +25341,7 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
<a href=#browsing-context>browsing context</a>, or if the element's <code><a href=#document>Document</a></code> is not <a href=#fully-active>fully
active</a>, or if the element is still in the <a href=#stack-of-open-elements>stack of open elements</a> of an
<a href=#html-parser>HTML parser</a> or <a href=#xml-parser>XML parser</a>, or if the element is not <a href=#being-rendered>being
rendered</a>, then jump to the last step in the overall set of steps (fallback).</p>
rendered</a>, then jump to the step below labeled <i>fallback</i>.</p>

</li>

Expand All @@ -25358,8 +25357,7 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
<a href=#plugin>plugin</a> can be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, then that
<a href=#plugin>plugin</a> <a href=#object-plugin>should be used</a>, and the value of the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute, if any, should be passed to the
<a href=#plugin>plugin</a>. If no suitable <a href=#plugin>plugin</a> can be found, or if the
<a href=#plugin>plugin</a> reports an error, jump to the last step in the overall set of steps
(fallback).</p>
<a href=#plugin>plugin</a> reports an error, jump to the step below labeled <i>fallback</i>.</p>

<!--
case insensitive:
Expand Down Expand Up @@ -25394,13 +25392,11 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</

<ol><li><p>If the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute is present and its value is
not a type that the user agent supports, and is not a type that the user agent can find a
<a href=#plugin>plugin</a> for, then the user agent may jump to the last step in the overall set of
steps (fallback) without fetching the content to examine its real type.</li>
<a href=#plugin>plugin</a> for, then the user agent may jump to the step below labeled <i>fallback</i> without fetching the content to examine its real type.</li>

<li><p><a href=#resolve-a-url title="resolve a url">Resolve</a> the <a href=#url>URL</a> specified by the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute, relative to the element.</li>

<li><p>If that failed, <a href=#fire-a-simple-event>fire a simple event</a> named <code title=event-error>error</code> at the element, then jump to the last step in the overall set
of steps (fallback).</li>
<li><p>If that failed, <a href=#fire-a-simple-event>fire a simple event</a> named <code title=event-error>error</code> at the element, then jump to the step below labeled <i>fallback</i>.</li>

<li>

Expand All @@ -25422,14 +25418,14 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</

<li><p>If the resource is not yet available (e.g. because the resource was not available in the
cache, so that loading the resource required making a request over the network), then jump to
the last step in the overall set of steps (fallback). The <a href=#concept-task title=concept-task>task</a> that is <a href=#queue-a-task title="queue a task">queued</a> by the
the step below labeled <i>fallback</i>. The <a href=#concept-task title=concept-task>task</a> that is <a href=#queue-a-task title="queue a task">queued</a> by the
<a href=#networking-task-source>networking task source</a> once the resource is available must restart this algorithm
from this step. Resources can load incrementally; user agents may opt to consider a resource
"available" whenever enough data has been obtained to begin processing the resource.</li>

<li><p>If the load failed (e.g. there was an HTTP 404 error, there was a DNS error), <a href=#fire-a-simple-event>fire
a simple event</a> named <code title=event-error>error</code> at the element, then jump to
the last step in the overall set of steps (fallback).</li>
the step below labeled <i>fallback</i>.</li>

<li id=object-type-detection>

Expand Down Expand Up @@ -25668,13 +25664,11 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
<dd>

<p>If <a href=#sandboxPluginObject>plugins are being sandboxed</a> and the plugin that
supports <var title="">resource type</var> cannot be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, jump to the last step in the overall set of
steps (fallback).</p>
supports <var title="">resource type</var> cannot be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, jump to the step below labeled <i>fallback</i>.</p>

<p>Otherwise, the user agent should <a href=#object-plugin>use the plugin that supports
<var title="">resource type</var></a> and pass the content of the resource to that
<a href=#plugin>plugin</a>. If the <a href=#plugin>plugin</a> reports an error, then jump to the last step
in the overall set of steps (fallback).</p>
<a href=#plugin>plugin</a>. If the <a href=#plugin>plugin</a> reports an error, then jump to the step below labeled <i>fallback</i>.</p>

</dd>

Expand Down Expand Up @@ -25731,7 +25725,7 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
not a <a href=#nested-browsing-context>nested browsing context</a>.</p>

<p>If the image cannot be rendered, e.g. because it is malformed or in an unsupported
format, jump to the last step in the overall set of steps (fallback).</p>
format, jump to the step below labeled <i>fallback</i>.</p>

</dd>

Expand All @@ -25740,8 +25734,7 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</

<dd>

<p>The given <var title="">resource type</var> is not supported. Jump to the last step in
the overall set of steps (fallback).</p>
<p>The given <var title="">resource type</var> is not supported. Jump to the step below labeled <i>fallback</i>.</p>

<p class=note>If the previous step ended with the <var title="">resource type</var> being
unknown, this is the case that is triggered.</p>
Expand All @@ -25768,9 +25761,9 @@ <h4 id=the-object-element><span class=secno>4.8.4 </span>The <dfn><code>object</
<li><p>If the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute is absent but the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute is present, and the user agent can find a
<a href=#plugin>plugin</a> suitable according to the value of the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute, and either <a href=#sandboxPluginObject>plugins
aren't being sandboxed</a> or the <a href=#plugin>plugin</a> can be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, then that <a href=#plugin>plugin</a> <a href=#object-plugin>should be used</a>. If these conditions cannot be met, or if the
<a href=#plugin>plugin</a> reports an error, jump to the next step (fallback).</li>
<a href=#plugin>plugin</a> reports an error, jump to the step below labeled <i>fallback</i>.</li>

<li><p>(Fallback.) The <code><a href=#the-object-element>object</a></code> element <a href=#represents>represents</a> the element's
<li><p><i>Fallback</i>: The <code><a href=#the-object-element>object</a></code> element <a href=#represents>represents</a> the element's
children, ignoring any leading <code><a href=#the-param-element>param</a></code> element children. This is the element's
<a href=#fallback-content>fallback content</a>. If the element has an instantiated <a href=#plugin>plugin</a>, then
unload it.</li>
Expand Down
33 changes: 13 additions & 20 deletions index
View file
Expand Up @@ -25326,8 +25326,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<ol><li>

<p>If the user has indicated a preference that this <code><a href=#the-object-element>object</a></code> element's <a href=#fallback-content>fallback
content</a> be shown instead of the element's usual behavior, then jump to the last step in
the overall set of steps (fallback).</p>
content</a> be shown instead of the element's usual behavior, then jump to the step below labeled <i>fallback</i>.</p>

<p class=note>For example, a user could ask for the element's <a href=#fallback-content>fallback content</a> to
be shown because that content uses a format that the user finds more accessible.</p>
Expand All @@ -25342,7 +25341,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<a href=#browsing-context>browsing context</a>, or if the element's <code><a href=#document>Document</a></code> is not <a href=#fully-active>fully
active</a>, or if the element is still in the <a href=#stack-of-open-elements>stack of open elements</a> of an
<a href=#html-parser>HTML parser</a> or <a href=#xml-parser>XML parser</a>, or if the element is not <a href=#being-rendered>being
rendered</a>, then jump to the last step in the overall set of steps (fallback).</p>
rendered</a>, then jump to the step below labeled <i>fallback</i>.</p>

</li>

Expand All @@ -25358,8 +25357,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<a href=#plugin>plugin</a> can be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, then that
<a href=#plugin>plugin</a> <a href=#object-plugin>should be used</a>, and the value of the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute, if any, should be passed to the
<a href=#plugin>plugin</a>. If no suitable <a href=#plugin>plugin</a> can be found, or if the
<a href=#plugin>plugin</a> reports an error, jump to the last step in the overall set of steps
(fallback).</p>
<a href=#plugin>plugin</a> reports an error, jump to the step below labeled <i>fallback</i>.</p>

<!--
case insensitive:
Expand Down Expand Up @@ -25394,13 +25392,11 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>

<ol><li><p>If the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute is present and its value is
not a type that the user agent supports, and is not a type that the user agent can find a
<a href=#plugin>plugin</a> for, then the user agent may jump to the last step in the overall set of
steps (fallback) without fetching the content to examine its real type.</li>
<a href=#plugin>plugin</a> for, then the user agent may jump to the step below labeled <i>fallback</i> without fetching the content to examine its real type.</li>

<li><p><a href=#resolve-a-url title="resolve a url">Resolve</a> the <a href=#url>URL</a> specified by the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute, relative to the element.</li>

<li><p>If that failed, <a href=#fire-a-simple-event>fire a simple event</a> named <code title=event-error>error</code> at the element, then jump to the last step in the overall set
of steps (fallback).</li>
<li><p>If that failed, <a href=#fire-a-simple-event>fire a simple event</a> named <code title=event-error>error</code> at the element, then jump to the step below labeled <i>fallback</i>.</li>

<li>

Expand All @@ -25422,14 +25418,14 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>

<li><p>If the resource is not yet available (e.g. because the resource was not available in the
cache, so that loading the resource required making a request over the network), then jump to
the last step in the overall set of steps (fallback). The <a href=#concept-task title=concept-task>task</a> that is <a href=#queue-a-task title="queue a task">queued</a> by the
the step below labeled <i>fallback</i>. The <a href=#concept-task title=concept-task>task</a> that is <a href=#queue-a-task title="queue a task">queued</a> by the
<a href=#networking-task-source>networking task source</a> once the resource is available must restart this algorithm
from this step. Resources can load incrementally; user agents may opt to consider a resource
"available" whenever enough data has been obtained to begin processing the resource.</li>

<li><p>If the load failed (e.g. there was an HTTP 404 error, there was a DNS error), <a href=#fire-a-simple-event>fire
a simple event</a> named <code title=event-error>error</code> at the element, then jump to
the last step in the overall set of steps (fallback).</li>
the step below labeled <i>fallback</i>.</li>

<li id=object-type-detection>

Expand Down Expand Up @@ -25668,13 +25664,11 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<dd>

<p>If <a href=#sandboxPluginObject>plugins are being sandboxed</a> and the plugin that
supports <var title="">resource type</var> cannot be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, jump to the last step in the overall set of
steps (fallback).</p>
supports <var title="">resource type</var> cannot be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, jump to the step below labeled <i>fallback</i>.</p>

<p>Otherwise, the user agent should <a href=#object-plugin>use the plugin that supports
<var title="">resource type</var></a> and pass the content of the resource to that
<a href=#plugin>plugin</a>. If the <a href=#plugin>plugin</a> reports an error, then jump to the last step
in the overall set of steps (fallback).</p>
<a href=#plugin>plugin</a>. If the <a href=#plugin>plugin</a> reports an error, then jump to the step below labeled <i>fallback</i>.</p>

</dd>

Expand Down Expand Up @@ -25731,7 +25725,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
not a <a href=#nested-browsing-context>nested browsing context</a>.</p>

<p>If the image cannot be rendered, e.g. because it is malformed or in an unsupported
format, jump to the last step in the overall set of steps (fallback).</p>
format, jump to the step below labeled <i>fallback</i>.</p>

</dd>

Expand All @@ -25740,8 +25734,7 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>

<dd>

<p>The given <var title="">resource type</var> is not supported. Jump to the last step in
the overall set of steps (fallback).</p>
<p>The given <var title="">resource type</var> is not supported. Jump to the step below labeled <i>fallback</i>.</p>

<p class=note>If the previous step ended with the <var title="">resource type</var> being
unknown, this is the case that is triggered.</p>
Expand All @@ -25768,9 +25761,9 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<li><p>If the <code title=attr-object-data><a href=#attr-object-data>data</a></code> attribute is absent but the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute is present, and the user agent can find a
<a href=#plugin>plugin</a> suitable according to the value of the <code title=attr-object-type><a href=#attr-object-type>type</a></code> attribute, and either <a href=#sandboxPluginObject>plugins
aren't being sandboxed</a> or the <a href=#plugin>plugin</a> can be <a href=#concept-plugin-secure title=concept-plugin-secure>secured</a>, then that <a href=#plugin>plugin</a> <a href=#object-plugin>should be used</a>. If these conditions cannot be met, or if the
<a href=#plugin>plugin</a> reports an error, jump to the next step (fallback).</li>
<a href=#plugin>plugin</a> reports an error, jump to the step below labeled <i>fallback</i>.</li>

<li><p>(Fallback.) The <code><a href=#the-object-element>object</a></code> element <a href=#represents>represents</a> the element's
<li><p><i>Fallback</i>: The <code><a href=#the-object-element>object</a></code> element <a href=#represents>represents</a> the element's
children, ignoring any leading <code><a href=#the-param-element>param</a></code> element children. This is the element's
<a href=#fallback-content>fallback content</a>. If the element has an instantiated <a href=#plugin>plugin</a>, then
unload it.</li>
Expand Down

0 comments on commit 6eb1a51

Please sign in to comment.