html5/spec Overview.html,1.5691,1.5692

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv2489

Modified Files:
	Overview.html 
Log Message:
move the definition of 'script' for origins down a bit. (whatwg r7140)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5691
retrieving revision 1.5692
diff -u -d -r1.5691 -r1.5692
--- Overview.html	22 Jun 2012 20:54:24 -0000	1.5691
+++ Overview.html	22 Jun 2012 21:54:00 -0000	1.5692
@@ -53801,84 +53801,6 @@
    </dd>
 
 
-   <dt>For scripts</dt>
-
-   <dd>
-
-    <p>The <a href="#origin">origin</a> and <a href="#effective-script-origin">effective script
-    origin</a> of a script are determined from another resource,
-    called the <i>owner</i>:</p>
-
-    <dl class="switch"><dt>If a script is in a <code><a href="#the-script-element">script</a></code> element</dt>
-
-     <dd>The owner is the <code><a href="#document">Document</a></code> to which the
-     <code><a href="#the-script-element">script</a></code> element belongs.</dd>
-
-
-     <dt>If a script is in an <a href="#event-handler-content-attributes" title="event handler content
-     attributes">event handler content attribute</a></dt>
-
-     <dd>The owner is the <code><a href="#document">Document</a></code> to which the
-     attribute node belongs.</dd>
-
-
-     <dt>If a script is a function or other code reference created by
-     another script</dt>
-
-     <dd>The owner is the script that created it.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> that was returned as the
-     location of an HTTP redirect (<a href="#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a> in
-     other protocols)</dt>
-
-     <dd>The owner is the <a href="#url">URL</a> that redirected to the
-     <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a>.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> in an attribute</dt>
-
-     <dd>The owner is the <code><a href="#document">Document</a></code> of the element on
-     which the attribute is found.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> in a style sheet</dt>
-
-     <dd>The owner is the <a href="#url">URL</a> of the style sheet.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
-     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
-     the URL having been provided by the user (e.g. by using a
-     <i>bookmarklet</i>)</dt>
-
-     <dd>The owner is the <code><a href="#document">Document</a></code> of the <a href="#browsing-context">browsing
-     context</a>'s <a href="#active-document">active document</a>.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
-     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
-     the URL having been declared in markup</dt>
-
-     <dd>The owner is the <code><a href="#document">Document</a></code> of the element
-     (e.g. an <code><a href="#the-a-element">a</a></code> or <code><a href="#the-area-element">area</a></code> element) that
-     declared the URL.</dd>
-
-
-     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
-     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
-     the URL having been provided by script</dt>
-
-     <dd>The owner is the script that provided the URL.</dd>
-
-    </dl><p>The <a href="#origin">origin</a> of the script is then equal to the
-    <a href="#origin">origin</a> of the owner, and the <a href="#effective-script-origin">effective script
-    origin</a> of the script is equal to the <a href="#effective-script-origin">effective script
-    origin</a> of the owner.</p>
-
-   </dd>
-
-
    <dt>For <code><a href="#document">Document</a></code> objects</dt>
 
    <dd>
@@ -54012,6 +53934,84 @@
 
    </dd>
 
+
+   <dt>For scripts</dt>
+
+   <dd>
+
+    <p>The <a href="#origin">origin</a> and <a href="#effective-script-origin">effective script
+    origin</a> of a script are determined from another resource,
+    called the <i>owner</i>:</p>
+
+    <dl class="switch"><dt>If a script is in a <code><a href="#the-script-element">script</a></code> element</dt>
+
+     <dd>The owner is the <code><a href="#document">Document</a></code> to which the
+     <code><a href="#the-script-element">script</a></code> element belongs.</dd>
+
+
+     <dt>If a script is in an <a href="#event-handler-content-attributes" title="event handler content
+     attributes">event handler content attribute</a></dt>
+
+     <dd>The owner is the <code><a href="#document">Document</a></code> to which the
+     attribute node belongs.</dd>
+
+
+     <dt>If a script is a function or other code reference created by
+     another script</dt>
+
+     <dd>The owner is the script that created it.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> that was returned as the
+     location of an HTTP redirect (<a href="#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a> in
+     other protocols)</dt>
+
+     <dd>The owner is the <a href="#url">URL</a> that redirected to the
+     <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a>.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> in an attribute</dt>
+
+     <dd>The owner is the <code><a href="#document">Document</a></code> of the element on
+     which the attribute is found.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> in a style sheet</dt>
+
+     <dd>The owner is the <a href="#url">URL</a> of the style sheet.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
+     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
+     the URL having been provided by the user (e.g. by using a
+     <i>bookmarklet</i>)</dt>
+
+     <dd>The owner is the <code><a href="#document">Document</a></code> of the <a href="#browsing-context">browsing
+     context</a>'s <a href="#active-document">active document</a>.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
+     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
+     the URL having been declared in markup</dt>
+
+     <dd>The owner is the <code><a href="#document">Document</a></code> of the element
+     (e.g. an <code><a href="#the-a-element">a</a></code> or <code><a href="#the-area-element">area</a></code> element) that
+     declared the URL.</dd>
+
+
+     <dt>If a script is a <a href="#javascript-protocol" title="javascript protocol"><code title="">javascript:</code> URL</a> to which a <a href="#browsing-context">browsing
+     context</a> is being <a href="#navigate" title="navigate">navigated</a>,
+     the URL having been provided by script</dt>
+
+     <dd>The owner is the script that provided the URL.</dd>
+
+    </dl><p>The <a href="#origin">origin</a> of the script is then equal to the
+    <a href="#origin">origin</a> of the owner, and the <a href="#effective-script-origin">effective script
+    origin</a> of the script is equal to the <a href="#effective-script-origin">effective script
+    origin</a> of the owner.</p>
+
+   </dd>
+
   </dl><p>Other specifications can override the above definitions by
   themselves specifying the origin of a particular URL, script,
   <code><a href="#document">Document</a></code>, or image.</p>

Received on Friday, 22 June 2012 21:54:08 UTC