Skip to content

Commit

Permalink
Shadow: <slot> is now defined in HTML
Browse files Browse the repository at this point in the history
  • Loading branch information
@annevk
annevk committed Apr 21, 2016
1 parent 8d281a3 commit fdad8cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 2 additions & 3 deletions dom.bs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1481,8 +1481,7 @@ itself.</p>
<p>A <a>shadow tree</a> contains zero or more <a for=/>elements</a> that are
<dfn export id=concept-slot lt=slot>slots</dfn>.</p>

<p class="note">A <a>slot</a> can only be created through HTML's <code>slot</code> element.</p>
<!-- XXX HTML slot: use <{slot}> -->
<p class="note">A <a>slot</a> can only be created through HTML's <{slot}> element.</p>

<p>A <a>slot</a> has an associated <dfn export for=slot>name</dfn> (a string). Unless stated
otherwise it is the empty string.</p>
Expand Down Expand Up @@ -2587,7 +2586,7 @@ interface Slotable {
};
Element implements Slotable;
Text implements Slotable;
</pre><!-- XXX HTML slot -->
</pre>

<p>The <dfn attribute for=Slotable><code>assignedSlot</code></dfn> attribute's getter must return
the result of <a>find a slot</a> given <a>context object</a> and with the <i>open flag</i> set.</p>
Expand Down
8 changes: 5 additions & 3 deletions dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ <h4 class="heading settled" data-level="4.2.2" id="shadow-trees"><span class="se
<p>An <a data-link-type="dfn" href="#concept-element">element</a> is <dfn data-dfn-type="dfn" data-export="" id="in-a-shadow-including-document">in a shadow-including document<a class="self-link" href="#in-a-shadow-including-document"></a></dfn> if its <a data-link-type="dfn" href="#concept-shadow-including-root">shadow-including root</a> is a <a data-link-type="dfn" href="#concept-document">document</a>. </p>
<h5 class="heading settled" data-level="4.2.2.1" id="shadow-tree-slots"><span class="secno">4.2.2.1. </span><span class="content">Slots</span><a class="self-link" href="#shadow-tree-slots"></a></h5>
<p>A <a data-link-type="dfn" href="#concept-shadow-tree">shadow tree</a> contains zero or more <a data-link-type="dfn" href="#concept-element">elements</a> that are <dfn data-dfn-type="dfn" data-export="" data-lt="slot" id="concept-slot">slots<a class="self-link" href="#concept-slot"></a></dfn>.</p>
<p class="note" role="note">A <a data-link-type="dfn" href="#concept-slot">slot</a> can only be created through HTML’s <code>slot</code> element.</p>
<p class="note" role="note">A <a data-link-type="dfn" href="#concept-slot">slot</a> can only be created through HTML’s <code><a data-link-type="element" href="https://html.spec.whatwg.org/multipage/scripting.html#the-slot-element">slot</a></code> element.</p>
<p>A <a data-link-type="dfn" href="#concept-slot">slot</a> has an associated <dfn data-dfn-for="slot" data-dfn-type="dfn" data-export="" id="slot-name">name<a class="self-link" href="#slot-name"></a></dfn> (a string). Unless stated
otherwise it is the empty string.</p>
<p>Use these <a data-link-type="dfn" href="#concept-element-attributes-change-ext">attribute change steps</a> to update a <a data-link-type="dfn" href="#concept-slot">slot</a>’s <a data-link-type="dfn" href="#slot-name">name</a>: </p>
Expand Down Expand Up @@ -1641,7 +1641,7 @@ <h4 class="heading settled" data-level="4.2.9" id="mixin-slotable"><span class="
<pre class="idl def">[NoInterfaceObject,
Exposed=Window]
interface <dfn class="idl-code" data-dfn-type="interface" data-export="" id="slotable">Slotable<a class="self-link" href="#slotable"></a></dfn> {
readonly attribute <a data-link-type="idl-name">HTMLSlotElement</a>? <a class="idl-code" data-link-type="attribute" data-readonly="" data-type="HTMLSlotElement? " href="#dom-slotable-assignedslot">assignedSlot</a>;
readonly attribute <a data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/scripting.html#htmlslotelement">HTMLSlotElement</a>? <a class="idl-code" data-link-type="attribute" data-readonly="" data-type="HTMLSlotElement? " href="#dom-slotable-assignedslot">assignedSlot</a>;
};
<a data-link-type="idl-name" href="#element">Element</a> implements <a data-link-type="idl-name" href="#slotable">Slotable</a>;
<a data-link-type="idl-name" href="#text">Text</a> implements <a data-link-type="idl-name" href="#slotable">Slotable</a>;
Expand Down Expand Up @@ -6210,6 +6210,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
<li><a href="https://html.spec.whatwg.org/multipage/webappapis.html#errorevent">ErrorEvent</a>
<li><a href="https://html.spec.whatwg.org/multipage/dom.html#htmlelement">HTMLElement</a>
<li><a href="https://html.spec.whatwg.org/multipage/semantics.html#htmlhtmlelement">HTMLHtmlElement</a>
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#htmlslotelement">HTMLSlotElement</a>
<li><a href="https://html.spec.whatwg.org/multipage/browsers.html#hashchangeevent">HashChangeEvent</a>
<li><a href="https://html.spec.whatwg.org/multipage/comms.html#messageevent">MessageEvent</a>
<li><a href="https://html.spec.whatwg.org/multipage/browsers.html#pagetransitionevent">PageTransitionEvent</a>
Expand All @@ -6231,6 +6232,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#concept-custom-element-definition-name">name</a>
<li><a href="https://html.spec.whatwg.org/multipage/browsers.html#concept-origin-opaque">opaque origin</a>
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#script">script</a>
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#the-slot-element">slot</a>
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#the-template-element">template</a>
<li><a href="https://html.spec.whatwg.org/multipage/semantics.html#the-title-element">title</a>
<li><a href="https://html.spec.whatwg.org/multipage/scripting.html#concept-try-upgrade">try to upgrade an element</a>
Expand Down Expand Up @@ -6465,7 +6467,7 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
[NoInterfaceObject,
Exposed=Window]
interface <a href="#slotable">Slotable</a> {
readonly attribute <a data-link-type="idl-name">HTMLSlotElement</a>? <a class="idl-code" data-link-type="attribute" data-readonly="" data-type="HTMLSlotElement? " href="#dom-slotable-assignedslot">assignedSlot</a>;
readonly attribute <a data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/scripting.html#htmlslotelement">HTMLSlotElement</a>? <a class="idl-code" data-link-type="attribute" data-readonly="" data-type="HTMLSlotElement? " href="#dom-slotable-assignedslot">assignedSlot</a>;
};
<a data-link-type="idl-name" href="#element">Element</a> implements <a data-link-type="idl-name" href="#slotable">Slotable</a>;
<a data-link-type="idl-name" href="#text">Text</a> implements <a data-link-type="idl-name" href="#slotable">Slotable</a>;
Expand Down

0 comments on commit fdad8cb

Please sign in to comment.