Skip to content

Commit

Permalink
[] (0) URLification of commands. Made other aspects of commands more …
Browse files Browse the repository at this point in the history 
…consistent while I was at it.

git-svn-id: http://svn.whatwg.org/webapps@1806 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jun 26, 2008
1 parent 6bb6c83 commit 09882ca
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 79 deletions.
68 changes: 27 additions & 41 deletions index
View file
Expand Up @@ -28287,7 +28287,7 @@ XXX selection ranges -->
<dt><dfn id=icon1 title=command-facet-Icon>Icon</dfn>

<dd>An <a href="#absolute">absolute URL</a> identifying a graphical image
that represents the action.
that represents the action. A command might not have an Icon.

<dt><dfn id=hidden1 title=command-facet-HiddenState>Hidden State</dfn>

Expand Down Expand Up @@ -28389,17 +28389,16 @@ XXX selection ranges -->
a command or does not specify a <a href="#hint"
title=command-facet-Hint>Hint</a>. This attribute will be shadowed by the
<code title=dom-title><a href="#title0">title</a></code> DOM attribute on
the <code><a href="#htmlelement">HTMLElement</a></code> interface.</p>
<!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->
<!-- XXXURL "must return the absolute URL of the command's icon"? -->
the <code><a href="#htmlelement">HTMLElement</a></code> interface.

<p>The <dfn id=icon2 title=dom-command-ro-icon><code>icon</code></dfn>
attribute must return an absolute URI to the command's <a href="#icon1"
title=command-facet-Icon>Icon</a>. If the element does not specify an
icon, or if the element does not define a command, then the attribute must
return null. This attribute will be shadowed by the <code
title=dom-command-icon><a href="#icon0">icon</a></code> DOM attribute on
<code><a href="#command0">command</a></code> elements.
attribute must return the <a href="#absolute">absolute URL</a> of the
command's <a href="#icon1" title=command-facet-Icon>Icon</a>. If the
element does not specify an icon, or if the element does not define a
command, then the attribute must return null. This attribute will be
shadowed by the <code title=dom-command-icon><a
href="#icon0">icon</a></code> DOM attribute on <code><a
href="#command0">command</a></code> elements.

<p>The <dfn id=hidden2
title=dom-command-ro-hidden><code>hidden</code></dfn> attribute must
Expand Down Expand Up @@ -28483,30 +28482,17 @@ XXX selection ranges -->

<p>The <a href="#hint" title=command-facet-Hint>Hint</a> of the command is
the value of the <code title=attr-title><a href="#title">title</a></code>
attribute of the <code><a href="#a">a</a></code> element. If the attribute
is not present, the <a href="#hint" title=command-facet-Hint>Hint</a> is
the empty string.</p>
<!-- XXXURL refer to the URL algorithms -->
attribute of the element. If the attribute is not present, the <a
href="#hint" title=command-facet-Hint>Hint</a> is the empty string.

<p>The <a href="#icon1" title=command-facet-Icon>Icon</a> of the command is
the absolute URI of the first image in the element. Specifically, in a
depth-first search of the children of the element, the first element that
is <!--either an--> <code><a href="#img">img</a></code> element with a
<code>src</code> attribute<!--, or an <code>object</code> element
with a <code>data</code> attribute, or, if the UA supports SVG, an
<code>svg</code> element in the SVG namespace with a valid <code
title="">id</code> attribute,-->
is the one that is used as the image.
<!--If it is an <code>img</code> element then--> The URI must be taken
from the element's <code>src</code> attribute. <!--If it is
an <code>object</code> element then the URI is taken from the
<code>data</code> attribute. -->
Relative URIs must be resolved relative to the <span title="element's base
URI">base URI</span> of the image element.
<!-- If it is an <code>svg</code> element then
the URI is formed by taking the URI of the document and appending a
"#" (U+0023 NUMBER SIGN) and the ID of the element.-->
If no image is found, then the Icon facet is left blank.
the <a href="#absolute">absolute URL</a> obtained from <a href="#resolve"
title="resolve a url">resolving</a> the value of the <code
title=attr-img-src><a href="#src">src</a></code> attribute of the first
<code><a href="#img">img</a></code> element descendant of the element, if
there is such an element and resolving its attribute is successful.
Otherwise, there is no <a href="#icon1" title=command-facet-Icon>Icon</a>
for the command.

<p>The <a href="#hidden1" title=command-facet-HiddenState>Hidden State</a>
and <a href="#disabled6" title=command-facet-DisabledState>Disabled
Expand Down Expand Up @@ -28705,16 +28691,15 @@ XXX selection ranges -->
<p>The <a href="#hint" title=command-facet-Hint>Hint</a> of the command is
the string given by the element's <code title=attr-command-title><a
href="#title6">title</a></code> attribute, if any, and the empty string if
the attribute is absent.</p>
<!-- XXXURL refer to the URL algorithms -->
the attribute is absent.

<p>The <a href="#icon1" title=command-facet-Icon>Icon</a> for the command
is the absolute URI resulting from resolving the value of the element's
<code title=attr-command-icon><a href="#icon">icon</a></code> attribute as
a URI relative to the <span>element's base URI</span>. If the element has
no <code title=attr-command-icon><a href="#icon">icon</a></code> attribute
then the command has no <a href="#icon1"
title=command-facet-Icon>Icon</a>.
is the <a href="#absolute">absolute URL</a> obtained from <a
href="#resolve" title="resolve a url">resolving</a> the value of the
element's <code title=attr-command-icon><a href="#icon">icon</a></code>
attribute, if it has such an attribute and resolving it is successful.
Otherwise, there is no <a href="#icon1" title=command-facet-Icon>Icon</a>
for the command.

<p>The <a href="#hidden1" title=command-facet-HiddenState>Hidden State</a>
of the command is true (hidden) if the element has a <code
Expand Down Expand Up @@ -28922,7 +28907,8 @@ XXX selection ranges -->

<p>The <dfn id=mode2 title=dom-nest-mode><code>mode</code></dfn> DOM
attribute must <a href="#reflect">reflect</a> the <code
title=attr-nest-mode><a href="#mode1">mode</a></code> content attribute.
title=attr-nest-mode><a href="#mode1">mode</a></code> content attribute.</p>
<!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->

<h4 id=global0><span class=secno>4.12.5 </span>Global attributes for data
templates</h4>
Expand Down
63 changes: 25 additions & 38 deletions source
View file
Expand Up @@ -25831,7 +25831,7 @@ XXX selection ranges -->
<dt><dfn title="command-facet-Icon">Icon</dfn></dt>

<dd>An <span>absolute URL</span> identifying a graphical image that
represents the action.</dd>
represents the action. A command might not have an Icon.</dd>

<dt><dfn title="command-facet-HiddenState">Hidden State</dfn></dt>

Expand Down Expand Up @@ -25936,16 +25936,12 @@ XXX selection ranges -->
shadowed by the <code title="dom-title">title</code> DOM attribute
on the <code>HTMLElement</code> interface.</p>


<!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->

<!-- XXXURL "must return the absolute URL of the command's icon"? -->
<p>The <dfn title="dom-command-ro-icon"><code>icon</code></dfn>
attribute must return an absolute URI to the command's <span
title="command-facet-Icon">Icon</span>. If the element does not
specify an icon, or if the element does not define a command, then
the attribute must return null. This attribute will be shadowed by
the <code title="dom-command-icon">icon</code> DOM attribute on
attribute must return the <span>absolute URL</span> of the command's
<span title="command-facet-Icon">Icon</span>. If the element does
not specify an icon, or if the element does not define a command,
then the attribute must return null. This attribute will be shadowed
by the <code title="dom-command-icon">icon</code> DOM attribute on
<code>command</code> elements.</p>

<p>The <dfn title="dom-command-ro-hidden"><code>hidden</code></dfn>
Expand Down Expand Up @@ -26031,28 +26027,17 @@ XXX selection ranges -->

<p>The <span title="command-facet-Hint">Hint</span> of the command
is the value of the <code title="attr-title">title</code> attribute
of the <code>a</code> element. If the attribute is not present, the
<span title="command-facet-Hint">Hint</span> is the empty
string.</p>
of the element. If the attribute is not present, the <span
title="command-facet-Hint">Hint</span> is the empty string.</p>

<!-- XXXURL refer to the URL algorithms -->
<p>The <span title="command-facet-Icon">Icon</span> of the command
is the absolute URI of the first image in the element. Specifically,
in a depth-first search of the children of the element, the first
element that is <!--either an--> <code>img</code> element with a
<code>src</code> attribute<!--, or an <code>object</code> element
with a <code>data</code> attribute, or, if the UA supports SVG, an
<code>svg</code> element in the SVG namespace with a valid <code
title="">id</code> attribute,--> is the one that is used as the
image. <!--If it is an <code>img</code> element then--> The URI must
be taken from the element's <code>src</code> attribute. <!--If it is
an <code>object</code> element then the URI is taken from the
<code>data</code> attribute. --> Relative URIs must be resolved
relative to the <span title="element's base URI">base URI</span> of
the image element. <!-- If it is an <code>svg</code> element then
the URI is formed by taking the URI of the document and appending a
"#" (U+0023 NUMBER SIGN) and the ID of the element.--> If no image
is found, then the Icon facet is left blank.</p>
is the <span>absolute URL</span> obtained from <span title="resolve
a url">resolving</span> the value of the <code
title="attr-img-src">src</code> attribute of the first
<code>img</code> element descendant of the element, if there is such
an element and resolving its attribute is successful. Otherwise,
there is no <span title="command-facet-Icon">Icon</span> for the
command.</p>

<p>The <span title="command-facet-HiddenState">Hidden State</span>
and <span title="command-facet-DisabledState">Disabled State</span>
Expand Down Expand Up @@ -26254,13 +26239,12 @@ XXX selection ranges -->
title="attr-command-title">title</code> attribute, if any, and the
empty string if the attribute is absent.</p>

<!-- XXXURL refer to the URL algorithms -->
<p>The <span title="command-facet-Icon">Icon</span> for the command
is the absolute URI resulting from resolving the value of the
element's <code title="attr-command-icon">icon</code> attribute as a
URI relative to the <span>element's base URI</span>. If the element
has no <code title="attr-command-icon">icon</code> attribute then
the command has no <span title="command-facet-Icon">Icon</span>.</p>
is the <span>absolute URL</span> obtained from <span title="resolve
a url">resolving</span> the value of the element's <code
title="attr-command-icon">icon</code> attribute, if it has such an
attribute and resolving it is successful. Otherwise, there is no
<span title="command-facet-Icon">Icon</span> for the command.</p>

<p>The <span title="command-facet-HiddenState">Hidden State</span>
of the command is true (hidden) if the element has a <code
Expand Down Expand Up @@ -26429,8 +26413,11 @@ XXX selection ranges -->
title="attr-nest-filter">filter</code> content attribute.</p>

<p>The <dfn title="dom-nest-mode"><code>mode</code></dfn> DOM
attribute must <span>reflect</span> the <code title="attr-nest-mode">mode</code>
content attribute.</p>
attribute must <span>reflect</span> the <code
title="attr-nest-mode">mode</code> content attribute.</p>


<!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->


<h4>Global attributes for data templates</h4>
Expand Down

0 comments on commit 09882ca

Please sign in to comment.