Skip to content
This repository has been archived by the owner on Jul 30, 2019. It is now read-only.

Commit

Permalink
Integrate changes from HTMLLS (#463)
Browse files Browse the repository at this point in the history
* Merge more stuff from HTMLLS

* Correct url to https

* Integrate ec1dc4d4571c61cf0c0dfe3e562898635886b412

* Changed for f5d8c99753f17cb8f384c6ad6650378ef5d9f52c

* changes for b437a803c2310d8fb2e05aef343ea24166afb9fd

* Add text for 925ffb821f49bcf6dcec88ca756e0189879d5462

* Editorial b466ad7ce49676873ddade4c473b7c983803bfd4
  • Loading branch information
arronei authored and travisleithead committed Jun 6, 2016
1 parent d1a2cc5 commit be513d1
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 36 deletions.
3 changes: 3 additions & 0 deletions sections/acknowledgements.include
Expand Up @@ -96,6 +96,7 @@
Atsushi Takayama,
Aurelien Levy,
Ave Wrigley,
Avi Drissman,
Axel Dahmen,
Bart Humphries,
Ben Boyle,
Expand Down Expand Up @@ -124,6 +125,7 @@
Brad Neuberg,
Brad Spencer,
Brady Eidson,
Brandon Jones,
Brendan Eich,
Brenton Simpson,
Brett Wilson,
Expand Down Expand Up @@ -738,6 +740,7 @@
Trevor Saunders,
triple-underscore, <!-- on GitHub -->
Tyler Close,
Valentin Gosu,
Victor Carbune,
Vipul Snehadeep Chawathe,
Vitya Muhachev,
Expand Down
6 changes: 3 additions & 3 deletions sections/browsers.include
Expand Up @@ -4784,12 +4784,12 @@
agent should ask the user to confirm that they wish to unload the document.

The prompt shown by the user agent may include the string of the
{{BeforeUnloadEvent/returnValue}} attribute, or some leading subset thereof. (A user agent may
want to truncate the string to 1024 characters for display, for instance.)
{{BeforeUnloadEvent/returnValue}} attribute, or <a>optionally truncated</a>.

The user agent must <a state for="useragent">pause</a> while waiting for the user's response.

If the user did not confirm the page navigation, then the user agent <dfn lt="refused to allow the document to be unloaded|refused to allow this document to be unloaded">refused to allow the document to be unloaded</dfn>.
If the user did not confirm the page navigation, then the user agent
<dfn lt="refused to allow the document to be unloaded|refused to allow this document to be unloaded">refused to allow the document to be unloaded</dfn>.

</li>

Expand Down
2 changes: 1 addition & 1 deletion sections/dom.include
Expand Up @@ -732,7 +732,7 @@
void blur();
attribute DOMString accessKey;
attribute boolean draggable;
[PutForwards=value] readonly attribute DOMTokenList dropzone;
[SameObject, PutForwards=value] readonly attribute DOMTokenList dropzone;
attribute HTMLMenuElement? contextMenu;
attribute boolean spellcheck;
void forceSpellCheck();
Expand Down
4 changes: 1 addition & 3 deletions sections/editing.include
Expand Up @@ -1013,7 +1013,7 @@
also happen to an <{input}> element when the element gets disabled.
</p>

<dfn>Focus fixup rule two</dfn>: When a <a>dialog group</a> has no designed <a>focused
<dfn>Focus fixup rule two</dfn>: When a <a>dialog group</a> has no designated <a>focused
dialog of the dialog group</a>, and its <a>dialog group manager</a>'s <a>control
group</a> changes from being non-empty to being empty, the first non-<a>inert</a>
<code>dialog</code> in the <a>dialog group</a>, if any, or else the first <code>dialog</code> in
Expand Down Expand Up @@ -1067,8 +1067,6 @@

<ol>

<li>Unset the <a>sequential focus navigation starting point</a>.</li>

<li>If the last entry in <var>old chain</var> and the last entry in <var>new chain</var> are the same, pop the last entry from <var>old chain</var>
and the last entry from <var>new chain</var> and redo this step.</li>

Expand Down
4 changes: 2 additions & 2 deletions sections/events.include
Expand Up @@ -71,7 +71,7 @@
<td><dfn event for="global"><code>change</code></dfn></td>
<td>{{Event}}</td>
<td>Form controls</td>
<td>Fired at controls when the user commits a value change (see also the <a event for="global"><code>change</code></a> event of <{input}> elements)</td>
<td>Fired at controls when the user commits a value change (see also the <a event for="global"><code>input</code></a> event)</td>
</tr>
<tr> <!-- click -->
<td><a event><code>click</code></a></td>
Expand Down Expand Up @@ -128,7 +128,7 @@
<td><dfn event for="global"><code>input</code></dfn></td>
<td>{{Event}}</td>
<td>Form controls</td>
<td>Fired at controls when the user changes the value (see also the <a><code>change</code></a> event of <{input}> elements)</td>
<td>Fired at controls when the user changes the value (see also the <a event for="global"><code>change</code></a> event)</td>
</tr>
<tr> <!-- invalid -->
<td><dfn event for="global"><code>invalid</code></dfn></td>
Expand Down
3 changes: 1 addition & 2 deletions sections/infrastructure.include
Expand Up @@ -3770,8 +3770,7 @@

If a reflecting IDL attribute has the type {{DOMTokenList}}, then on getting it must return a
{{DOMTokenList}} object whose associated element is the element in question and whose associated
attribute's local name is the name of the attribute in question. The same {{DOMTokenList}}
object must be returned every time for each attribute.
attribute's local name is the name of the attribute in question.

If a reflecting IDL attribute has the type {{HTMLElement}}, or an interface that
descends from {{HTMLElement}}, then, on getting, it must run the following algorithm
Expand Down
4 changes: 2 additions & 2 deletions sections/semantics-document-metadata.include
Expand Up @@ -353,11 +353,11 @@
attribute DOMString? crossOrigin;
attribute DOMString rel;
attribute DOMString rev;
readonly attribute DOMTokenList relList;
[SameObject, PutForwards=value]readonly attribute DOMTokenList relList;
attribute DOMString media;
attribute DOMString hreflang;
attribute DOMString type;
[PutForwards=value] readonly attribute DOMTokenList sizes;
[SameObject, PutForwards=value] readonly attribute DOMTokenList sizes;
};
HTMLLinkElement implements LinkStyle;
</pre>
Expand Down
6 changes: 3 additions & 3 deletions sections/semantics-embedded-content.include
Expand Up @@ -3461,7 +3461,7 @@ My &lt;img src="heart.png" alt="heart"&gt; breaks.
attribute DOMString src;
attribute DOMString srcdoc;
attribute DOMString name;
[PutForwards=value] readonly attribute DOMTokenList sandbox;
[SameObject, PutForwards=value] readonly attribute DOMTokenList sandbox;
attribute boolean allowFullscreen;
attribute DOMString width;
attribute DOMString height;
Expand Down Expand Up @@ -11743,7 +11743,7 @@ red:89
attribute DOMString target;
attribute DOMString download;
attribute DOMString rel;
readonly attribute DOMTokenList relList;
[SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
attribute DOMString hreflang;
attribute DOMString type;
};
Expand Down Expand Up @@ -12099,7 +12099,7 @@ red:89

The shape is a circle whose center is <var>x</var> CSS pixels from the left edge
of the image and <var>y</var> CSS pixels from the top edge of the image, and whose
radius is <var>r</var> pixels.
radius is <var>r</var> CSS pixels.

</dd>

Expand Down
2 changes: 1 addition & 1 deletion sections/semantics-forms.include
Expand Up @@ -9210,7 +9210,7 @@ Daddy"&gt;&lt;/textarea&gt;
<dd>
<pre class="idl" data-highlight="webidl" dfn-for="HTMLOutputElement">
interface HTMLOutputElement : HTMLElement {
[PutForwards=value] readonly attribute DOMTokenList htmlFor;
[SameObject, PutForwards=value] readonly attribute DOMTokenList htmlFor;
readonly attribute HTMLFormElement? form;
attribute DOMString name;

Expand Down
2 changes: 1 addition & 1 deletion sections/semantics-tabular-data.include
Expand Up @@ -1474,7 +1474,7 @@ the cell that corresponds to the values of the two dice.
interface HTMLTableCellElement : HTMLElement {
attribute unsigned long colSpan;
attribute unsigned long rowSpan;
[PutForwards=value] readonly attribute DOMTokenList headers;
[SameObject, PutForwards=value] readonly attribute DOMTokenList headers;
readonly attribute long cellIndex;
};
</pre>
Expand Down
8 changes: 5 additions & 3 deletions sections/semantics-textlevel.include
Expand Up @@ -51,7 +51,7 @@
attribute DOMString download;
attribute DOMString rel;
attribute DOMString rev;
readonly attribute DOMTokenList relList;
[SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
attribute DOMString hreflang;
attribute DOMString type;
attribute DOMString text;
Expand Down Expand Up @@ -1876,8 +1876,10 @@ affected by the heat source (upper left) and the food source (lower right).&lt;/
descendants.

The <dfn>datetime value</dfn> of a <{time}> element is the value of the element's
<code>datetime</code> content attribute, if it has one, or the
element's {{Node/textContent}}, if it does not.
<{time/datetime}> content attribute, if it has one, otherwise the concatenation of the contents of
all the <code>Text</code> nodes that are children of the <{time}> element (ignoring any other
nodes such as comments or elements), in <a>tree order</a>.


The <a>datetime value</a> of a <{time}> element must match one of the following
syntaxes.
Expand Down
43 changes: 30 additions & 13 deletions sections/webappapis.include
Expand Up @@ -574,10 +574,10 @@
few seconds, prompt the user to either terminate the script or let it continue.

<pre highlight="html">
&lt;script>
while (true) { /* loop */ }
&lt;/script>
</pre>
&lt;script>
while (true) { /* loop */ }
&lt;/script>
</pre>
</div>

User agents are encouraged to allow users to disable scripting whenever the user is prompted
Expand Down Expand Up @@ -686,8 +686,9 @@
15. If <var>event</var> was canceled, then the error is <a for="script">handled</a>. Otherwise,
the error is <a for="script">not handled</a>.

<p class="note">Returning true cancels event per <a>the event handler processing
algorithm</a>.</p>
<p class="note">
Returning true cancels <var>event</var> per <a>the event handler processing algorithm</a>.
</p>

<h6 id="runtime-script-errors-in-documents">Runtime script errors in documents</h6>

Expand Down Expand Up @@ -2634,6 +2635,17 @@
loading their <a>media data</a>, are stalled when these methods are invoked.
</p>

To <dfn lt="optionally truncated|optionally truncating|optionally truncate a simple dialog string">optionally truncate a simple dialog string</dfn>
<var>s</var>, return either <var>s</var> itself or some string derived from <var>s</var> that is
shorter. User agents should not provide UI for displaying the elided portion of <var>s</var>, as
this makes it too easy for abusers to create dialogs of the form "Important security alert! Click
'Show More' for full details!".

<p class="note">For example, a user agent might want to only display the first 100 characters of a
message. Or, a user agent might replace the middle of the string with "&hellip;". These types of
modifications can be useful in limiting the abuse potential of unnaturally large,
trustworthy-looking system dialogs.</p>

The <dfn method for="Window" lt="alert()|alert(message)"><code>alert(<var>message</var>)</code></dfn>
method, when invoked, must run the following steps:

Expand Down Expand Up @@ -2662,7 +2674,7 @@

</ol>

The <dfn><code>confirm(<var>message</var>)</code></dfn> method,
The <dfn method for="Window" lt="confirm()|confirm(message)"><code>confirm(<var>message</var>)</code></dfn> method,
when invoked, must run the following steps:

<ol>
Expand All @@ -2679,8 +2691,10 @@
the user the option to ignore all prompts, and would thus abort at this step whenever the method
was invoked.)</li>

<li>Show the given <var>message</var> to the user, and ask the user to respond with a
positive or negative response.</li>
<li>Set <var>message</var> to the result of <a>optionally truncating</a> <var>message</var>.</li>

<li>Show <var>message</var> to the user, and ask the user to respond with a positive or
negative response.</li>

<li><a state for="useragent">Pause</a> until the user responds either positively or negatively.</li>

Expand All @@ -2689,7 +2703,7 @@

</ol>

The <dfn><code>prompt(<var>message</var>, <var>default</var>)</code></dfn> method, when invoked, must run the following steps:
The <dfn method for="Window" lt="prompt()|prompt(message,default)"><code>prompt(<var>message</var>, <var>default</var>)</code></dfn> method, when invoked, must run the following steps:

<ol>

Expand All @@ -2705,9 +2719,12 @@
user the option to ignore all prompts, and would thus abort at this step whenever the method was
invoked.)</li>

<li>Show the given <var>message</var> to the user, and ask the user to either respond
with a string value or abort. The response must be defaulted to the value given by
<var>default</var>.</li>
<li>Set <var>message</var> to the result of <a>optionally truncating</a> <var>message</var>.</li>

<li>Set <var>default</var> to the result of <a>optionally truncating</a> <var>default</var>.</li>

<li>Show <var>message</var> to the user, and ask the user to either respond with a string
value or abort. The response must be defaulted to the value given by <var>default</var>.</li>

<li><a state for="useragent">Pause</a> while waiting for the user's response.</li>

Expand Down
2 changes: 0 additions & 2 deletions single-page.bs
Expand Up @@ -41,8 +41,6 @@ url: https://www.w3.org/TR/REC-xml-names#NT-QName; type: dfn;
text: QName;
url: https://drafts.csswg.org/css2/conform.html#intrinsic; type: dfn;
text: intrinsic width and height;
urlPrefix: https://www.w3.org/TR/2007/WD-becss-20071019/; type: property;
text: binding;
url: https://www.w3.org/TR/1999/REC-xpath-19991116#dt-expanded-name; type: dfn;
text: expanded-name;
url: https://tools.ietf.org/html/rfc1034#section-3.5; type: dfn;
Expand Down

0 comments on commit be513d1

Please sign in to comment.