Apply b7f3cc1, dd39ee4,and 998421f from the WHATWG Notifications document.
--- a/Overview.html Fri May 24 12:13:10 2013 -0700
+++ b/Overview.html Thu Aug 15 15:21:23 2013 -0700
@@ -222,12 +222,14 @@
user.
+
<h2 id="terminology"><span class="secno">3 </span>Terminology</h2>
-<p>Most terminology used in this specification is from DOM, IDL, and HTML.
+<p>Most terminology used in this specification is from DOM, HTML, IDL, and URL.
<a href="#refsDOM">[DOM]</a>
+<a href="#refsHTML">[HTML]</a>
<a href="#refsWEBIDL">[WEBIDL]</a>
-<a href="#refsHTML">[HTML]</a>
+<a href="#refsURL">[URL]</a>
@@ -485,6 +487,12 @@
attribute <a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#eventhandler">EventHandler</a> <a href="#handler-onerror" title="handler-onerror">onerror</a>;
attribute <a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#eventhandler">EventHandler</a> <a href="#handler-onclose" title="handler-onclose">onclose</a>;
+ readonly attribute <a href="#notificationdirection">NotificationDirection</a> <a href="#dom-notification-dir" title="dom-Notification-dir">dir</a>;
+ readonly attribute DOMString <a href="#dom-notification-dir" title="dom-Notification-dir">lang</a>;
+ readonly attribute DOMString <a href="#dom-notification-dir" title="dom-Notification-dir">body</a>;
+ readonly attribute DOMString <a href="#dom-notification-dir" title="dom-Notification-dir">tag</a>;
+ readonly attribute DOMString <a href="#dom-notification-dir" title="dom-Notification-dir">icon</a>;
+
void <a href="#dom-notification-close" title="dom-Notification-close">close</a>();
};
@@ -621,7 +629,24 @@
must run the <a href="#close-steps">close steps</a> for the
<a href="#concept-notification" title="concept-notification">notification</a>.
+<p>The <dfn id="dom-notification-dir" title="dom-Notification-dir"><code>dir</code></dfn> attribute must return the
+<a href="#concept-notification" title="concept-notification">notification</a>'s <a href="#direction">direction</a>.
+<p>The <dfn id="dom-notification-lang" title="dom-Notification-lang"><code>lang</code></dfn> attribute must return the
+<a href="#concept-notification" title="concept-notification">notification</a>'s <a href="#language">language</a>.
+
+<p>The <dfn id="dom-notification-body" title="dom-Notification-body"><code>body</code></dfn> attribute must return the
+<a href="#concept-notification" title="concept-notification">notification</a>'s <a href="#body">body</a> and the empty
+string otherwise.
+
+<p>The <dfn id="dom-notification-tag" title="dom-Notification-tag"><code>tag</code></dfn> attribute must return the
+<a href="#concept-notification" title="concept-notification">notification</a>'s <a href="#tag">tag</a> and the empty
+string otherwise.
+
+<p>The <dfn id="dom-notification-icon" title="dom-Notification-icon"><code>icon</code></dfn> attribute must return the
+<a href="#concept-notification" title="concept-notification">notification</a>'s <a href="#icon-url">icon URL</a>,
+<a class="external" data-anolis-spec="url" href="http://url.spec.whatwg.org/#concept-url-serializer" title="concept-url-serializer">serialized</a>, and the
+empty string otherwise.
@@ -720,6 +745,9 @@
<dt id="refsRFC2119">[RFC2119]
<dd><cite><a href="http://tools.ietf.org/html/rfc2119">Key words for use in RFCs to Indicate Requirement Levels</a></cite>, Scott Bradner. IETF.
+<dt id="refsURL">[URL]
+<dd><cite><a href="http://url.spec.whatwg.org/">URL</a></cite>, Anne van Kesteren. WHATWG.
+
<dt id="refsWEBIDL">[WEBIDL]
<dd><cite><a href="http://dev.w3.org/2006/webapi/WebIDL/">Web IDL</a></cite>, Cameron McCormack. W3C.
--- a/Overview.src.html Fri May 24 12:13:10 2013 -0700
+++ b/Overview.src.html Thu Aug 15 15:21:23 2013 -0700
@@ -166,14 +166,12 @@
platform-independent. Since the common platforms do not provide the same
functionality, this spec will indicate what events are guaranteed and
which are not. In particular, notifications as specified here only can
-contain text and icon content. In the future, notifications generated from
-web content may wish to contain web content themselves, but that is outside
-the scope of this document.
+contain text and icon content.
<p>In general, the event model for notifications is best-effort; while the
<code>Notification</code> object offers a <code title>click</code> event,
applications may enhance their functionality by listening for that event,
-but <em>must not depend on receiving it</em>, in case the underlying
+but cannot depend on receiving it, in case the underlying
notification platform does not provide that capability.
@@ -199,12 +197,14 @@
user.
+
<h2>Terminology</h2>
-<p>Most terminology used in this specification is from DOM, IDL, and HTML.
+<p>Most terminology used in this specification is from DOM, HTML, IDL, and URL.
<span data-anolis-ref>DOM</span>
+<span data-anolis-ref>HTML</span>
<span data-anolis-ref>WEBIDL</span>
-<span data-anolis-ref>HTML</span>
+<span data-anolis-ref>URL</span>
@@ -462,6 +462,12 @@
attribute <span data-anolis-spec=html>EventHandler</span> <span title=handler-onerror>onerror</span>;
attribute <span data-anolis-spec=html>EventHandler</span> <span title=handler-onclose>onclose</span>;
+ readonly attribute <span>NotificationDirection</span> <span title=dom-Notification-dir>dir</span>;
+ readonly attribute DOMString <span title=dom-Notification-dir>lang</span>;
+ readonly attribute DOMString <span title=dom-Notification-dir>body</span>;
+ readonly attribute DOMString <span title=dom-Notification-dir>tag</span>;
+ readonly attribute DOMString <span title=dom-Notification-dir>icon</span>;
+
void <span title=dom-Notification-close>close</span>();
};
@@ -519,13 +525,12 @@
<var title>notification</var>'s <span>tag</span> to <code title>tag</code>.
<li><p>If <var title>options</var>'s <code title>icon</code> is present,
- <span title="resolve a URL" data-anolis-spec=html>resolve</span>
- <code title>icon</code> against the
+ <span title=concept-url-parser data-anolis-spec=url>parse</span>
+ <code title>icon</code> using the
<span data-anolis-spec=html>entry script</span>'s
<span title="script's base URL" data-anolis-spec=html>base URL</span>, and
- if that does not fail, set
- <var title>notification</var>'s <span>icon URL</span> to the resulting
- <span data-anolis-spec=html>absolute URL</span>. (Otherwise
+ if that does not return failure, set
+ <var title>notification</var>'s <span>icon URL</span> to the return value. (Otherwise
<span>icon URL</span> is not set.)
<li><p>Return <var title>notification</var>, but continue running these
@@ -598,7 +603,24 @@
must run the <span>close steps</span> for the
<span title=concept-notification>notification</span>.
+<p>The <dfn title=dom-Notification-dir><code>dir</code></dfn> attribute must return the
+<span title=concept-notification>notification</span>'s <span>direction</span>.
+<p>The <dfn title=dom-Notification-lang><code>lang</code></dfn> attribute must return the
+<span title=concept-notification>notification</span>'s <span>language</span>.
+
+<p>The <dfn title=dom-Notification-body><code>body</code></dfn> attribute must return the
+<span title=concept-notification>notification</span>'s <span>body</span> and the empty
+string otherwise.
+
+<p>The <dfn title=dom-Notification-tag><code>tag</code></dfn> attribute must return the
+<span title=concept-notification>notification</span>'s <span>tag</span> and the empty
+string otherwise.
+
+<p>The <dfn title=dom-Notification-icon><code>icon</code></dfn> attribute must return the
+<span title=concept-notification>notification</span>'s <span>icon URL</span>,
+<span title=concept-url-serializer data-anolis-spec=url>serialized</span>, and the
+empty string otherwise.