--- a/Overview.html Wed Jun 20 15:35:26 2012 +0200
+++ b/Overview.html Wed Jun 20 15:45:10 2012 +0200
@@ -224,15 +224,13 @@
delivery of email.
<p>Each <a href="#concept-notification" title="concept-notification">notification</a> has a
-<dfn id="title">title</dfn> (string). For specification simplicity each
+<dfn id="title">title</dfn> and an <dfn id="origin">origin</dfn>. For specification simplicity each
<a href="#concept-notification" title="concept-notification">notification</a> also has a
<dfn id="title-direction">title direction</dfn> and <dfn id="body-direction">body direction</dfn>, both of which are
initially "<code title="">auto</code>".
<p>Each <a href="#concept-notification" title="concept-notification">notification</a> <em>can</em>
-have an associated <dfn id="body">body</dfn> (string),
-<dfn id="tag">tag</dfn> ((string, <a class="external" href="http://tools.ietf.org/html/rfc6454#section-4">origin</a>) tuple),
-and <dfn id="icon-url">icon URL</dfn> (<a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/urls.html#url">URL</a>).
+have an associated <dfn id="body">body</dfn>, <dfn id="tag">tag</dfn>, and <dfn id="icon-url">icon URL</dfn>.
<h3 id="permission"><span class="secno">4.1 </span>Permission</h3>
@@ -241,7 +239,7 @@
displayed if the user (or user agent on behalf of the user) has granted
<dfn id="permission-0">permission</dfn>. The <a href="#permission-0">permission</a> to display
<a href="#concept-notification" title="concept-notification">notifications</a> for a given
-<a class="external" href="http://tools.ietf.org/html/rfc6454#section-4">origin</a> can be one of three strings:
+<a data-anolis-spec="origin" href="#origin">origin</a> can be one of three strings:
<dl>
<dt>"<code title="">default</code>"
@@ -273,21 +271,21 @@
<p>The <dfn id="show-steps">show steps</dfn> for a given <var title="">notification</var> are:
<ol>
- <li><p>If <a href="#permission-0">permission</a> for the current
- <a class="external" href="http://tools.ietf.org/html/rfc6454#section-4">origin</a> is not
- "<code title="">granted</code>", cancel any ongoing
+ <li><p>If <a href="#permission-0">permission</a> for <var title="">notification</var>'s
+ <a href="#origin">origin</a> is not "<code title="">granted</code>", cancel any ongoing
<a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/fetching-resources.html#fetch">fetch</a> for
<var title="">notification</var>'s <a href="#icon-url">icon URL</a>,
<a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task">queue a task</a> to
- <a class="external" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-event-fire" title="concept-event-fire">fire an event</a> named
- <code title="">error</code> on <var title="">notification</var>, and terminate
- these steps.
+ <a class="external" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-event-fire" title="concept-event-fire">fire an event</a>
+ named <code title="">error</code> on <var title="">notification</var>, and
+ terminate these steps.
<li><p>If there is a <a href="#concept-notification" title="concept-notification">notification</a>
in the <a href="#list-of-pending-notifications">list of pending notifications</a> or the
<a href="#list-of-active-notifications">list of active notifications</a> whose <a href="#tag">tag</a> equals
- <var title="">notification</var>'s <a href="#tag">tag</a>, run the
- <a href="#replace-steps">replace steps</a> for that
+ <var title="">notification</var>'s <a href="#tag">tag</a> and whose
+ <a href="#origin">origin</a> equals <var title="">notification</var>'s
+ <a href="#origin">origin</a> , run the <a href="#replace-steps">replace steps</a> for that
<a href="#concept-notification" title="concept-notification">notification</a> and
<var title="">notification</var>, and then terminate these steps.
@@ -467,6 +465,9 @@
<var title="">title</var>,
<a class="external" href="http://dev.w3.org/2006/webapi/WebIDL/#dfn-obtain-unicode" title="convert a DOMString to a sequence of Unicode characters">converted to Unicode</a>.
+ <li><p>Set <var title="">notifications</var>'s <a href="#origin">origin</a> to the
+ current <a data-anolis-spec="origin" href="#origin">origin</a>.
+
<li><p>If <var title="">options</var> is not omitted and its
<code title="">titleDir</code> member is not null, set
<var title="">notification</var>'s <a href="#title-direction">title direction</a> to
@@ -484,8 +485,7 @@
<li><p>If <var title="">options</var> is not omitted and its
<code title="">tag</code> is not null, set <var title="">notification</var>'s
- <a href="#tag">tag</a> to
- (<code title="">tag</code>, current <a class="external" href="http://tools.ietf.org/html/rfc6454#section-4">origin</a>).
+ <a href="#tag">tag</a> to <code title="">tag</code>.
<li><p>If <var title="">options</var> is not omitted and its
<code title="">iconUrl</code> is not null, set <var title="">notification</var>'s
@@ -516,7 +516,7 @@
<li><p>If <var title="">permission</var> is "<code title="">default</code>",
ask the user whether showing notifications for the current
- <a class="external" href="http://tools.ietf.org/html/rfc6454#section-4">origin</a> is acceptable. If it is, set
+ <a data-anolis-spec="origin" href="#origin">origin</a> is acceptable. If it is, set
<var title="">permission</var> to "<code title="">granted</code>", or
"<code title="">denied</code>" otherwise.
--- a/Overview.src.html Wed Jun 20 15:35:26 2012 +0200
+++ b/Overview.src.html Wed Jun 20 15:45:10 2012 +0200
@@ -202,15 +202,13 @@
delivery of email.
<p>Each <span title=concept-notification>notification</span> has a
-<dfn>title</dfn> (string). For specification simplicity each
+<dfn>title</dfn> and an <dfn>origin</dfn>. For specification simplicity each
<span title=concept-notification>notification</span> also has a
<dfn>title direction</dfn> and <dfn>body direction</dfn>, both of which are
initially "<code title>auto</code>".
<p>Each <span title=concept-notification>notification</span> <em>can</em>
-have an associated <dfn>body</dfn> (string),
-<dfn>tag</dfn> ((string, <span data-anolis-spec=origin>origin</span>) tuple),
-and <dfn>icon URL</dfn> (<span data-anolis-spec=html>URL</span>).
+have an associated <dfn>body</dfn>, <dfn>tag</dfn>, and <dfn>icon URL</dfn>.
<h3>Permission</h3>
@@ -251,21 +249,21 @@
<p>The <dfn>show steps</dfn> for a given <var title>notification</var> are:
<ol>
- <li><p>If <span>permission</span> for the current
- <span data-anolis-spec=origin>origin</span> is not
- "<code title>granted</code>", cancel any ongoing
+ <li><p>If <span>permission</span> for <var title>notification</var>'s
+ <span>origin</span> is not "<code title>granted</code>", cancel any ongoing
<span data-anolis-spec=html>fetch</span> for
<var title>notification</var>'s <span>icon URL</span>,
<span data-anolis-spec=html>queue a task</span> to
- <span data-anolis-spec=dom title=concept-event-fire>fire an event</span> named
- <code title>error</code> on <var title>notification</var>, and terminate
- these steps.
+ <span data-anolis-spec=dom title=concept-event-fire>fire an event</span>
+ named <code title>error</code> on <var title>notification</var>, and
+ terminate these steps.
<li><p>If there is a <span title=concept-notification>notification</span>
in the <span>list of pending notifications</span> or the
<span>list of active notifications</span> whose <span>tag</span> equals
- <var title>notification</var>'s <span>tag</span>, run the
- <span>replace steps</span> for that
+ <var title>notification</var>'s <span>tag</span> and whose
+ <span>origin</span> equals <var title>notification</var>'s
+ <span>origin</span> , run the <span>replace steps</span> for that
<span title=concept-notification>notification</span> and
<var title>notification</var>, and then terminate these steps.
@@ -445,6 +443,9 @@
<var title>title</var>,
<span data-anolis-spec=webidl title="convert a DOMString to a sequence of Unicode characters">converted to Unicode</span>.
+ <li><p>Set <var title>notifications</var>'s <span>origin</span> to the
+ current <span data-anolis-spec=origin>origin</span>.
+
<li><p>If <var title>options</var> is not omitted and its
<code title>titleDir</code> member is not null, set
<var title>notification</var>'s <span>title direction</span> to
@@ -462,8 +463,7 @@
<li><p>If <var title>options</var> is not omitted and its
<code title>tag</code> is not null, set <var title>notification</var>'s
- <span>tag</span> to
- (<code title>tag</code>, current <span data-anolis-spec=origin>origin</span>).
+ <span>tag</span> to <code title>tag</code>.
<li><p>If <var title>options</var> is not omitted and its
<code title>iconUrl</code> is not null, set <var title>notification</var>'s