[giow] (0) Instead of MessageEvent.channel, use MessageEvent.target.n…

…ame. Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=25413 Affected topics: DOM APIs, HTML git-svn-id: http://svn.whatwg.org/webapps@8589 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Apr 30, 2014 · 87994a6 · 87994a6
1 parent 1fdbe87
commit 87994a6
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 51 deletions.
diff --git a/complete.html b/complete.html
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 29 April 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 30 April 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -80724,7 +80724,6 @@ <h3 id=the-messageevent-interfaces><span class=secno>9.1 </span>The <code><a hre
   readonly attribute any <a href=#dom-messageevent-data title=dom-MessageEvent-data>data</a>;
   readonly attribute DOMString <a href=#dom-messageevent-origin title=dom-MessageEvent-origin>origin</a>;
   readonly attribute DOMString <a href=#dom-messageevent-lasteventid title=dom-MessageEvent-lastEventId>lastEventId</a>;
-  readonly attribute DOMString <a href=#dom-messageevent-channel title=dom-MessageEvent-channel>channel</a>;
   readonly attribute (<a href=#windowproxy>WindowProxy</a> or <a href=#messageport>MessagePort</a>)? <a href=#dom-messageevent-source title=dom-MessageEvent-source>source</a>;
   readonly attribute <a href=#messageport>MessagePort</a>[]? <a href=#dom-messageevent-ports title=dom-MessageEvent-ports>ports</a>;
 };
@@ -80764,14 +80763,6 @@ <h3 id=the-messageevent-interfaces><span class=secno>9.1 </span>The <code><a hre
 
    </dd>
 
-   <dt><var title="">event</var> . <code title=dom-MessageEvent-channel><a href=#dom-messageevent-channel>channel</a></code></dt>
-
-   <dd>
-
-    <p>Returns the channel ID, for <a href=#broadcasting-to-other-browsing-contexts>broadcast channels</a>.</p>
-
-   </dd>
-
    <dt><var title="">event</var> . <code title=dom-MessageEvent-source><a href=#dom-messageevent-source>source</a></code></dt>
 
    <dd>
@@ -80807,10 +80798,6 @@ <h3 id=the-messageevent-interfaces><span class=secno>9.1 </span>The <code><a hre
   return the value it was initialized to. When the object is created, this attribute must be
   initialized to the empty string. It represents, in <a href=#server-sent-events>server-sent events</a>, the <a href=#concept-event-stream-last-event-id title=concept-event-stream-last-event-id>last event ID string</a> of the event source.</p>
 
-  <p>The <dfn id=dom-messageevent-channel title=dom-MessageEvent-channel><code>channel</code></dfn> attribute must return the
-  value it was initialized to. When the object is created, this attribute must be initialized to the
-  empty string. It represents, in <a href=#broadcasting-to-other-browsing-contexts>broadcast channels</a>, the channel of the message.</p>
-
   <p>The <dfn id=dom-messageevent-source title=dom-MessageEvent-source><code>source</code></dfn> attribute must return the
   value it was initialized to. When the object is created, this attribute must be initialized to
   null. It represents, in <a href=#web-messaging>cross-document messaging</a>, the <code><a href=#windowproxy>WindowProxy</a></code> of the
@@ -83454,6 +83441,7 @@ <h3 id=broadcasting-to-other-browsing-contexts><span class=secno>9.6 </span><dfn
 
   <pre class=idl>[<a href=#dom-broadcastchannel title=dom-BroadcastChannel>Constructor</a>(DOMString channel)]
 interface <dfn id=broadcastchannel>BroadcastChannel</dfn> : <a href=#eventtarget>EventTarget</a> {
+  readonly attribute DOMString <a href=#dom-broadcastchannel-name title=dom-BroadcastChannel-name>name</a>;
   void <a href=#dom-broadcastchannel-postmessage title=dom-BroadcastChannel-postMessage>postMessage</a>(DOMString message);
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-broadcastchannel-onmessage title=handler-BroadcastChannel-onmessage>onmessage</a>;
 };</pre>
@@ -83466,6 +83454,14 @@ <h3 id=broadcasting-to-other-browsing-contexts><span class=secno>9.6 </span><dfn
 
    </dd>
 
+   <dt><var title="">broadcastChannel</var> . <code title=dom-BroadcastChannel-name><a href=#dom-broadcastchannel-name>name</a></code></dt>
+
+   <dd>
+
+    <p>Returns the channel ID (as passed to the constructor).</p>
+
+   </dd>
+
    <dt><var title="">broadcastChannel</var> . <code title=dom-BroadcastChannel-postMessage><a href=#dom-broadcastchannel-postmessage>postMessage</a></code>(<var title="">message</var>)</dt>
 
    <dd>
@@ -83484,6 +83480,9 @@ <h3 id=broadcasting-to-other-browsing-contexts><span class=secno>9.6 </span><dfn
   name</a> is the constructor's first argument, and whose <a href=#broadcastchannel-settings-object><code>BroadcastChannel</code>
   settings object</a> is the <a href=#incumbent-settings-object>incumbent settings object</a>.</p>
 
+  <p>The <dfn id=dom-broadcastchannel-name title=dom-BroadcastChannel-name><code>name</code></dfn> attribute must return the
+  <a href=#channel-name>channel name</a>.</p>
+
   <p>The <dfn id=dom-broadcastchannel-postmessage title=dom-BroadcastChannel-postMessage><code>postMessage()</code></dfn> method,
   when invoked on a <code><a href=#broadcastchannel>BroadcastChannel</a></code> object <var title="">source</var> with an
   argument <var title="">message</var>, must run the following steps:</p>
@@ -83546,11 +83545,11 @@ <h3 id=broadcasting-to-other-browsing-contexts><span class=secno>9.6 </span><dfn
     <p>For each <code><a href=#broadcastchannel>BroadcastChannel</a></code> object in <var title="">destinations</var>,
     <a href=#queue-a-task>queue a task</a> that runs the following steps:</p>
 
-    <ol><li><p>Create an event that uses the <code><a href=#messageevent>MessageEvent</a></code> interface, with the event type
+    <ol><!--CLEANUP--><li><p>Create an event that uses the <code><a href=#messageevent>MessageEvent</a></code> interface, with the event type
      <code title=event-message><a href=#event-message>message</a></code>, which does not bubble, is not cancelable, and has
      no default action. The <code title=dom-MessageEvent-data><a href=#dom-messageevent-data>data</a></code> attribute must be
-     initialized to the value of the <var title="">message</var> argument, the <code title=dom-MessageEvent-origin><a href=#dom-messageevent-origin>origin</a></code> attribute must be initialized to the <a href=#unicode-serialization-of-an-origin title="Unicode serialization of an origin">Unicode serialization</a> of the
-     <a href=#origin>origin</a> specified by <var title="">source settings</var>, and the <code title=dom-MessageEvent-channel><a href=#dom-messageevent-channel>channel</a></code> attribute must be initialized to the <var title="">channel name</var>. This event is not <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>.</li>
+     initialized to the value of the <var title="">message</var> argument, and the <code title=dom-MessageEvent-origin><a href=#dom-messageevent-origin>origin</a></code> attribute must be initialized to the <a href=#unicode-serialization-of-an-origin title="Unicode serialization of an origin">Unicode serialization</a> of the
+     <a href=#origin>origin</a> specified by <var title="">source settings</var>. This event is not <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>.</li>
 
      <li><p><a href=#concept-event-dispatch title=concept-event-dispatch>Dispatch</a> the event at the
      <code><a href=#broadcastchannel>BroadcastChannel</a></code> object.</li>

diff --git a/index b/index
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 29 April 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 30 April 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -80724,7 +80724,6 @@ interface <dfn id=messageevent>MessageEvent</dfn> : <a href=#event>Event</a> {
   readonly attribute any <a href=#dom-messageevent-data title=dom-MessageEvent-data>data</a>;
   readonly attribute DOMString <a href=#dom-messageevent-origin title=dom-MessageEvent-origin>origin</a>;
   readonly attribute DOMString <a href=#dom-messageevent-lasteventid title=dom-MessageEvent-lastEventId>lastEventId</a>;
-  readonly attribute DOMString <a href=#dom-messageevent-channel title=dom-MessageEvent-channel>channel</a>;
   readonly attribute (<a href=#windowproxy>WindowProxy</a> or <a href=#messageport>MessagePort</a>)? <a href=#dom-messageevent-source title=dom-MessageEvent-source>source</a>;
   readonly attribute <a href=#messageport>MessagePort</a>[]? <a href=#dom-messageevent-ports title=dom-MessageEvent-ports>ports</a>;
 };
@@ -80764,14 +80763,6 @@ dictionary <dfn id=messageeventinit>MessageEventInit</dfn> : <a href=#eventinit>
 
    </dd>
 
-   <dt><var title="">event</var> . <code title=dom-MessageEvent-channel><a href=#dom-messageevent-channel>channel</a></code></dt>
-
-   <dd>
-
-    <p>Returns the channel ID, for <a href=#broadcasting-to-other-browsing-contexts>broadcast channels</a>.</p>
-
-   </dd>
-
    <dt><var title="">event</var> . <code title=dom-MessageEvent-source><a href=#dom-messageevent-source>source</a></code></dt>
 
    <dd>
@@ -80807,10 +80798,6 @@ dictionary <dfn id=messageeventinit>MessageEventInit</dfn> : <a href=#eventinit>
   return the value it was initialized to. When the object is created, this attribute must be
   initialized to the empty string. It represents, in <a href=#server-sent-events>server-sent events</a>, the <a href=#concept-event-stream-last-event-id title=concept-event-stream-last-event-id>last event ID string</a> of the event source.</p>
 
-  <p>The <dfn id=dom-messageevent-channel title=dom-MessageEvent-channel><code>channel</code></dfn> attribute must return the
-  value it was initialized to. When the object is created, this attribute must be initialized to the
-  empty string. It represents, in <a href=#broadcasting-to-other-browsing-contexts>broadcast channels</a>, the channel of the message.</p>
-
   <p>The <dfn id=dom-messageevent-source title=dom-MessageEvent-source><code>source</code></dfn> attribute must return the
   value it was initialized to. When the object is created, this attribute must be initialized to
   null. It represents, in <a href=#web-messaging>cross-document messaging</a>, the <code><a href=#windowproxy>WindowProxy</a></code> of the
@@ -83454,6 +83441,7 @@ callback <dfn id=portcollectioncallback>PortCollectionCallback</dfn> = void (<a
 
   <pre class=idl>[<a href=#dom-broadcastchannel title=dom-BroadcastChannel>Constructor</a>(DOMString channel)]
 interface <dfn id=broadcastchannel>BroadcastChannel</dfn> : <a href=#eventtarget>EventTarget</a> {
+  readonly attribute DOMString <a href=#dom-broadcastchannel-name title=dom-BroadcastChannel-name>name</a>;
   void <a href=#dom-broadcastchannel-postmessage title=dom-BroadcastChannel-postMessage>postMessage</a>(DOMString message);
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-broadcastchannel-onmessage title=handler-BroadcastChannel-onmessage>onmessage</a>;
 };</pre>
@@ -83466,6 +83454,14 @@ interface <dfn id=broadcastchannel>BroadcastChannel</dfn> : <a href=#eventtarget
 
    </dd>
 
+   <dt><var title="">broadcastChannel</var> . <code title=dom-BroadcastChannel-name><a href=#dom-broadcastchannel-name>name</a></code></dt>
+
+   <dd>
+
+    <p>Returns the channel ID (as passed to the constructor).</p>
+
+   </dd>
+
    <dt><var title="">broadcastChannel</var> . <code title=dom-BroadcastChannel-postMessage><a href=#dom-broadcastchannel-postmessage>postMessage</a></code>(<var title="">message</var>)</dt>
 
    <dd>
@@ -83484,6 +83480,9 @@ interface <dfn id=broadcastchannel>BroadcastChannel</dfn> : <a href=#eventtarget
   name</a> is the constructor's first argument, and whose <a href=#broadcastchannel-settings-object><code>BroadcastChannel</code>
   settings object</a> is the <a href=#incumbent-settings-object>incumbent settings object</a>.</p>
 
+  <p>The <dfn id=dom-broadcastchannel-name title=dom-BroadcastChannel-name><code>name</code></dfn> attribute must return the
+  <a href=#channel-name>channel name</a>.</p>
+
   <p>The <dfn id=dom-broadcastchannel-postmessage title=dom-BroadcastChannel-postMessage><code>postMessage()</code></dfn> method,
   when invoked on a <code><a href=#broadcastchannel>BroadcastChannel</a></code> object <var title="">source</var> with an
   argument <var title="">message</var>, must run the following steps:</p>
@@ -83546,11 +83545,11 @@ interface <dfn id=broadcastchannel>BroadcastChannel</dfn> : <a href=#eventtarget
     <p>For each <code><a href=#broadcastchannel>BroadcastChannel</a></code> object in <var title="">destinations</var>,
     <a href=#queue-a-task>queue a task</a> that runs the following steps:</p>
 
-    <ol><li><p>Create an event that uses the <code><a href=#messageevent>MessageEvent</a></code> interface, with the event type
+    <ol><!--CLEANUP--><li><p>Create an event that uses the <code><a href=#messageevent>MessageEvent</a></code> interface, with the event type
      <code title=event-message><a href=#event-message>message</a></code>, which does not bubble, is not cancelable, and has
      no default action. The <code title=dom-MessageEvent-data><a href=#dom-messageevent-data>data</a></code> attribute must be
-     initialized to the value of the <var title="">message</var> argument, the <code title=dom-MessageEvent-origin><a href=#dom-messageevent-origin>origin</a></code> attribute must be initialized to the <a href=#unicode-serialization-of-an-origin title="Unicode serialization of an origin">Unicode serialization</a> of the
-     <a href=#origin>origin</a> specified by <var title="">source settings</var>, and the <code title=dom-MessageEvent-channel><a href=#dom-messageevent-channel>channel</a></code> attribute must be initialized to the <var title="">channel name</var>. This event is not <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>.</li>
+     initialized to the value of the <var title="">message</var> argument, and the <code title=dom-MessageEvent-origin><a href=#dom-messageevent-origin>origin</a></code> attribute must be initialized to the <a href=#unicode-serialization-of-an-origin title="Unicode serialization of an origin">Unicode serialization</a> of the
+     <a href=#origin>origin</a> specified by <var title="">source settings</var>. This event is not <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>.</li>
 
      <li><p><a href=#concept-event-dispatch title=concept-event-dispatch>Dispatch</a> the event at the
      <code><a href=#broadcastchannel>BroadcastChannel</a></code> object.</li>

diff --git a/source b/source
@@ -90572,7 +90572,6 @@ interface <dfn>MessageEvent</dfn> : <span>Event</span> {
   readonly attribute any <span data-x="dom-MessageEvent-data">data</span>;
   readonly attribute DOMString <span data-x="dom-MessageEvent-origin">origin</span>;
   readonly attribute DOMString <span data-x="dom-MessageEvent-lastEventId">lastEventId</span>;
-  readonly attribute DOMString <span data-x="dom-MessageEvent-channel">channel</span>;
   readonly attribute (<span>WindowProxy</span> or <span>MessagePort</span>)? <span data-x="dom-MessageEvent-source">source</span>;
   readonly attribute <span>MessagePort</span>[]? <span data-x="dom-MessageEvent-ports">ports</span>;
 };
@@ -90614,14 +90613,6 @@ dictionary <dfn>MessageEventInit</dfn> : <span>EventInit</span> {
 
    </dd>
 
-   <dt><var data-x="">event</var> . <code data-x="dom-MessageEvent-channel">channel</code></dt>
-
-   <dd>
-
-    <p>Returns the channel ID, for <span>broadcast channels</span>.</p>
-
-   </dd>
-
    <dt><var data-x="">event</var> . <code data-x="dom-MessageEvent-source">source</code></dt>
 
    <dd>
@@ -90661,10 +90652,6 @@ dictionary <dfn>MessageEventInit</dfn> : <span>EventInit</span> {
   initialized to the empty string. It represents, in <span>server-sent events</span>, the <span
   data-x="concept-event-stream-last-event-id">last event ID string</span> of the event source.</p>
 
-  <p>The <dfn data-x="dom-MessageEvent-channel"><code>channel</code></dfn> attribute must return the
-  value it was initialized to. When the object is created, this attribute must be initialized to the
-  empty string. It represents, in <span>broadcast channels</span>, the channel of the message.</p>
-
   <p>The <dfn data-x="dom-MessageEvent-source"><code>source</code></dfn> attribute must return the
   value it was initialized to. When the object is created, this attribute must be initialized to
   null. It represents, in <span>cross-document messaging</span>, the <code>WindowProxy</code> of the
@@ -93722,6 +93709,7 @@ callback <dfn>PortCollectionCallback</dfn> = void (<span>MessagePort</span> port
 
   <pre class="idl">[<span data-x="dom-BroadcastChannel">Constructor</span>(DOMString channel)]
 interface <dfn>BroadcastChannel</dfn> : <span>EventTarget</span> {
+  readonly attribute DOMString <span data-x="dom-BroadcastChannel-name">name</span>;
   void <span data-x="dom-BroadcastChannel-postMessage">postMessage</span>(DOMString message);
            attribute <span>EventHandler</span> <span data-x="handler-BroadcastChannel-onmessage">onmessage</span>;
 };</pre>
@@ -93736,6 +93724,14 @@ interface <dfn>BroadcastChannel</dfn> : <span>EventTarget</span> {
 
    </dd>
 
+   <dt><var data-x="">broadcastChannel</var> . <code data-x="dom-BroadcastChannel-name">name</code></dt>
+
+   <dd>
+
+    <p>Returns the channel ID (as passed to the constructor).</p>
+
+   </dd>
+
    <dt><var data-x="">broadcastChannel</var> . <code data-x="dom-BroadcastChannel-postMessage">postMessage</code>(<var data-x="">message</var>)</dt>
 
    <dd>
@@ -93756,6 +93752,9 @@ interface <dfn>BroadcastChannel</dfn> : <span>EventTarget</span> {
   name</span> is the constructor's first argument, and whose <span><code>BroadcastChannel</code>
   settings object</span> is the <span>incumbent settings object</span>.</p>
 
+  <p>The <dfn data-x="dom-BroadcastChannel-name"><code>name</code></dfn> attribute must return the
+  <span>channel name</span>.</p>
+
   <p>The <dfn data-x="dom-BroadcastChannel-postMessage"><code>postMessage()</code></dfn> method,
   when invoked on a <code>BroadcastChannel</code> object <var data-x="">source</var> with an
   argument <var data-x="">message</var>, must run the following steps:</p>
@@ -93831,15 +93830,14 @@ interface <dfn>BroadcastChannel</dfn> : <span>EventTarget</span> {
 
     <ol>
 
+<!--CLEANUP-->
      <li><p>Create an event that uses the <code>MessageEvent</code> interface, with the event type
      <code data-x="event-message">message</code>, which does not bubble, is not cancelable, and has
      no default action. The <code data-x="dom-MessageEvent-data">data</code> attribute must be
-     initialized to the value of the <var data-x="">message</var> argument, the <code
+     initialized to the value of the <var data-x="">message</var> argument, and the <code
      data-x="dom-MessageEvent-origin">origin</code> attribute must be initialized to the <span
      data-x="Unicode serialization of an origin">Unicode serialization</span> of the
-     <span>origin</span> specified by <var data-x="">source settings</var>, and the <code
-     data-x="dom-MessageEvent-channel">channel</code> attribute must be initialized to the <var
-     data-x="">channel name</var>. This event is not <span
+     <span>origin</span> specified by <var data-x="">source settings</var>. This event is not <span
      data-x="concept-events-trusted">trusted</span>.</p></li>
 
      <li><p><span data-x="concept-event-dispatch">Dispatch</span> the event at the