- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 08 Sep 2010 22:17:55 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv22356
Modified Files:
Overview.html
Log Message:
Make the 'already started' flag actually work. Also, reorder things in the 'run' algorithm so that we check things in order of cost to check, instead of doing the work up front and then the checks afterwards. (whatwg r5449)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4343
retrieving revision 1.4344
diff -u -d -r1.4343 -r1.4344
--- Overview.html 8 Sep 2010 07:08:36 -0000 1.4343
+++ Overview.html 8 Sep 2010 22:17:51 -0000 1.4344
@@ -12271,8 +12271,7 @@
encoding</var></dfn>. They are determined when the script is run,
based on the attributes on the element at that time.</p>
- <p>When a <code><a href="#script">script</a></code> element that is neither marked as
- having <a href="#already-started">"already started"</a> nor marked as being
+ <p>When a <code><a href="#script">script</a></code> element that is not marked as being
<a href="#parser-inserted">"parser-inserted"</a> experiences one of the events listed
in the following list, the user agent must synchronously <a href="#running-a-script" title="running a script">run</a> the <code><a href="#script">script</a></code>
element:</p>
@@ -12291,7 +12290,27 @@
<code><a href="#script">script</a></code> element is to be run, the user agent must act as
follows:</p>
- <ol><li id="script-processing-prepare">
+ <ol><li id="script-processing-noscript">
+
+ <p>If <a href="#concept-n-noscript" title="concept-n-noscript">scripting is
+ disabled</a> for the <code><a href="#script">script</a></code> element, or if the
+ <code><a href="#script">script</a></code> element is marked as having <a href="#already-started">"already
+ started"</a>, then the user agent must abort these steps at
+ this point. The script is not executed.</p>
+
+ </li>
+
+ <li id="script-processing-empty">
+
+ <p>If the element has no <code title="attr-script-src"><a href="#attr-script-src">src</a></code>
+ attribute, and its child nodes consist only of comment nodes and
+ empty <a href="#text-node" title="text node">text nodes</a>, then the user
+ agent must abort these steps at this point. The script is not
+ executed.</p>
+
+ </li>
+
+ <li id="script-processing-prepare">
<p>If either:</p>
@@ -12323,6 +12342,15 @@
</li>
+ <li>
+
+ <p>If the user agent does not <a href="#support-the-scripting-language">support the scripting
+ language</a> given by <var><a href="#the-script-block-s-type">the script block's type</a></var> for
+ this <code><a href="#script">script</a></code> element, then the user agent must abort
+ these steps at this point. The script is not executed.</p>
+
+ </li>
+
<li id="script-processing-encoding">
<p>If the <code><a href="#script">script</a></code> element has a <code title="attr-script-charset"><a href="#attr-script-charset">charset</a></code> attribute, then let
@@ -12357,27 +12385,6 @@
</ol></li>
- <li id="script-processing-noscript">
-
- <p>If <a href="#concept-n-noscript" title="concept-n-noscript">scripting is
- disabled</a> for the <code><a href="#script">script</a></code> element, or if the
- user agent does not <a href="#support-the-scripting-language">support the scripting language</a>
- given by <var><a href="#the-script-block-s-type">the script block's type</a></var> for this
- <code><a href="#script">script</a></code> element, then the user agent must abort these
- steps at this point. The script is not executed.</p>
-
- </li>
-
- <li id="script-processing-empty">
-
- <p>If the element has no <code title="attr-script-src"><a href="#attr-script-src">src</a></code>
- attribute, and its child nodes consist only of comment nodes and
- empty <a href="#text-node" title="text node">text nodes</a>, then the user
- agent must abort these steps at this point. The script is not
- executed.</p>
-
- </li>
-
<li id="script-processing-start">
<p>The user agent must set the element's <a href="#already-started">"already
Received on Wednesday, 8 September 2010 22:17:57 UTC