[] (0) Make the definition of origin for bookmarklets actually make s…

…ense.

git-svn-id: http://svn.whatwg.org/webapps@837 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -25887,8 +25887,17 @@ at the first element with the given ID must be treated as if it was cloned and r
    <dt>If a script is a <a href="#the-javascript" title="javascript
     protocol"><code title="">javascript:</code> URI</a> to which a <a
     href="#browsing0">browsing context</a> is being <a href="#navigate"
-    title=navigate>navigated</a>, the URI having been declared in markup, or
-    provided by the user (e.g. by using a <i>bookmarklet</i>)
+    title=navigate>navigated</a>, the URI having been provided by the user
+    (e.g. by using a <i>bookmarklet</i>)
+
+   <dd>The origin is the origin of the <code>Document</code> of the <a
+    href="#browsing0">browsing context</a>'s <a href="#active">active
+    document</a>.
+
+   <dt>If a script is a <a href="#the-javascript" title="javascript
+    protocol"><code title="">javascript:</code> URI</a> to which a <a
+    href="#browsing0">browsing context</a> is being <a href="#navigate"
+    title=navigate>navigated</a>, the URI having been declared in markup
 
    <dd>The origin is the origin of the <code>Document</code> of the element
     (e.g. an <code><a href="#a">a</a></code> or <code><a
@@ -38754,23 +38763,24 @@ interface <dfn id=timeouthandler>TimeoutHandler</dfn> {
    Levenberg, Joshua Randall, Jukka K. Korpela, Kai Hendry, <!-- Keryx
   Web, = Lars Gunther -->
    Kornel Lesinski, &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (KUROSAWA Takeshi),
-   Lachlan Hunt, Larry Page, Lars Gunther, Laurens Holst, Lenny Domnitser,
-   L&eacute;onard Bouchet, Leons Petrazickis, Logan<!-- on moz irc -->,
-   Maciej Stachowiak, Malcolm Rowe, Mark Nottingham, Mark Schenk, Martijn
-   Wargers, Martin Atkins, Martin Honnen, Mathieu Henri, Matthew Mastracci,
-   Matthew Raymond, Matthew Thomas, Mattias Waldau, Max Romantschuk, Michael
-   'Ratt' Iannarelli, Michael A. Nachbaur, Michael Gratton, Michael Powers,
-   Michel Fortin, Mihai &#x015E;ucan<!-- from ROBO Design -->, Mike
-   Dierken<!-- S. Mike
-  Dierken -->, Mike Dixon, Mike Schinkel, Mike Shaver,
-   Mikko Rantalainen, Neil Deakin, Olav Junker Kj&aelig;r, Philip Taylor,
-   Rajas Moonka, Rimantas Liubertas, Robert O'Callahan, Robert Sayre, Roman
-   Ivanov, S. Mike Dierken, Sam Ruby, Sean Knapp, Shadow2531, Shaun Inman,
-   Simon Pieters, Stefan Haustein, Stephen Ma, Steve Runyon, Steven Garrity,
-   Stewart Brodie, Stuart Parmenter, Tantek &Ccedil;elik, Thomas Broyer,
-   Thomas O'Connor, Tim Altman, Vladimir Vuki&#x0107;evi&#x0107;, Wakaba,
-   William Swanson, and everyone on the WHATWG mailing list for their useful
-   and substantial comments.
+   Kristof Zelechovski, Lachlan Hunt, Larry Page, Lars Gunther, Laurens
+   Holst, Lenny Domnitser, L&eacute;onard Bouchet, Leons Petrazickis,
+   Logan<!-- on moz irc -->, Maciej Stachowiak, Malcolm Rowe, Mark
+   Nottingham, Mark Schenk, Martijn Wargers, Martin Atkins, Martin Honnen,
+   Mathieu Henri, Matthew Mastracci, Matthew Raymond, Matthew Thomas, Mattias
+   Waldau, Max Romantschuk, Michael 'Ratt' Iannarelli, Michael A. Nachbaur,
+   Michael Gratton, Michael Powers, Michel Fortin, Mihai
+   &#x015E;ucan<!-- from ROBO Design -->, Mike Dierken<!--
+  S. Mike Dierken -->,
+   Mike Dixon, Mike Schinkel, Mike Shaver, Mikko Rantalainen, Neil Deakin,
+   Olav Junker Kj&aelig;r, Philip Taylor, Rajas Moonka, Rimantas Liubertas,
+   Robert O'Callahan, Robert Sayre, Roman Ivanov, S. Mike Dierken, Sam Ruby,
+   Sean Knapp, Shadow2531, Shaun Inman, Simon Pieters, Stefan Haustein,
+   Stephen Ma, Steve Runyon, Steven Garrity, Stewart Brodie, Stuart
+   Parmenter, Tantek &Ccedil;elik, Thomas Broyer, Thomas O'Connor, Tim
+   Altman, Vladimir Vuki&#x0107;evi&#x0107;, Wakaba, William Swanson, and
+   everyone on the WHATWG mailing list for their useful and substantial
+   comments.
 
   <p>Special thanks to Richard Williamson for creating the first
    implementation of <code><a href="#canvas">canvas</a></code> in Safari,

source

@@ -23394,8 +23394,17 @@ at the first element with the given ID must be treated as if it was cloned and r
    <dt>If a script is a <span title="javascript protocol"><code
    title="">javascript:</code> URI</span> to which a <span>browsing
    context</span> is being <span title="navigate">navigated</span>,
-   the URI having been declared in markup, or provided by the user
-   (e.g. by using a <i>bookmarklet</i>)</dt>
+   the URI having been provided by the user (e.g. by using a
+   <i>bookmarklet</i>)</dt>
+
+   <dd>The origin is the origin of the <code>Document</code> of the
+   <span>browsing context</span>'s <span>active document</span>.</dd>
+
+
+   <dt>If a script is a <span title="javascript protocol"><code
+   title="">javascript:</code> URI</span> to which a <span>browsing
+   context</span> is being <span title="navigate">navigated</span>,
+   the URI having been declared in markup</dt>
 
    <dd>The origin is the origin of the <code>Document</code> of the
    element (e.g. an <code>a</code> or <code>area</code> element) that
@@ -35408,16 +35417,16 @@ interface <dfn>TimeoutHandler</dfn> {
   Stenback, Jon Perlow, Jonathan Worent, Jorgen Horstink, Josh
   Levenberg, Joshua Randall, Jukka K. Korpela, Kai Hendry, <!-- Keryx
   Web, = Lars Gunther --> Kornel Lesinski,
-  &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (KUROSAWA Takeshi), Lachlan Hunt,
-  Larry Page, Lars Gunther, Laurens Holst, Lenny Domnitser,
-  L&eacute;onard Bouchet, Leons Petrazickis, Logan<!-- on moz irc -->,
-  Maciej Stachowiak, Malcolm Rowe, Mark Nottingham, Mark Schenk,
-  Martijn Wargers, Martin Atkins, Martin Honnen, Mathieu Henri,
-  Matthew Mastracci, Matthew Raymond, Matthew Thomas, Mattias Waldau,
-  Max Romantschuk, Michael 'Ratt' Iannarelli, Michael A. Nachbaur,
-  Michael Gratton, Michael Powers, Michel Fortin, Mihai
-  &#x015E;ucan<!-- from ROBO Design -->, Mike Dierken<!-- S. Mike
-  Dierken -->, Mike Dixon, Mike Schinkel, Mike Shaver, Mikko
+  &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (KUROSAWA Takeshi), Kristof
+  Zelechovski, Lachlan Hunt, Larry Page, Lars Gunther, Laurens Holst,
+  Lenny Domnitser, L&eacute;onard Bouchet, Leons Petrazickis,
+  Logan<!-- on moz irc -->, Maciej Stachowiak, Malcolm Rowe, Mark
+  Nottingham, Mark Schenk, Martijn Wargers, Martin Atkins, Martin
+  Honnen, Mathieu Henri, Matthew Mastracci, Matthew Raymond, Matthew
+  Thomas, Mattias Waldau, Max Romantschuk, Michael 'Ratt' Iannarelli,
+  Michael A. Nachbaur, Michael Gratton, Michael Powers, Michel Fortin,
+  Mihai &#x015E;ucan<!-- from ROBO Design -->, Mike Dierken<!--
+  S. Mike Dierken -->, Mike Dixon, Mike Schinkel, Mike Shaver, Mikko
   Rantalainen, Neil Deakin, Olav Junker Kj&aelig;r, Philip Taylor,
   Rajas Moonka, Rimantas Liubertas, Robert O'Callahan, Robert Sayre,
   Roman Ivanov, S. Mike Dierken, Sam Ruby, Sean Knapp, Shadow2531,