- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 21 Sep 2012 10:43:40 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv4278
Modified Files:
single-page.html spec.html the-script-element.html
Log Message:
commit bf4c7e469950b4cd596c98f15a3ec505fec6d35f
Merge: 2c14e38 b8192a2
Author: Silvia Pfeiffer <silviapfeiffer1@gmail.com>
Date: Fri Sep 21 20:39:36 2012 +1000
Merge branch 'feature/whatwg_script'
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- single-page.html 21 Sep 2012 10:14:29 -0000 1.132
+++ single-page.html 21 Sep 2012 10:43:38 -0000 1.133
@@ -16349,7 +16349,10 @@
<dt id=script-processing-style-delayed>If the element does not
have a <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute, and
the element has been flagged as <a href=#parser-inserted>"parser-inserted"</a>,
- and the <code><a href=#document>Document</a></code> of the <a href=#html-parser>HTML parser</a> or
+ and either the parser that created the <code><a href=#the-script-element>script</a></code> is an
+ <a href=#xml-parser>XML parser</a> or it's an <a href=#html-parser>HTML parser</a> whose
+ <a href=#script-nesting-level>script nesting level</a> is zero, and the
+ <code><a href=#document>Document</a></code> of the <a href=#html-parser>HTML parser</a> or
<a href=#xml-parser>XML parser</a> that created the <code><a href=#the-script-element>script</a></code>
element <a href=#has-a-style-sheet-that-is-blocking-scripts>has a style sheet that is blocking
scripts</a></dt>
Index: the-script-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-script-element.html,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- the-script-element.html 21 Sep 2012 10:14:31 -0000 1.184
+++ the-script-element.html 21 Sep 2012 10:43:38 -0000 1.185
@@ -795,7 +795,10 @@
<dt id="script-processing-style-delayed">If the element does not
have a <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute, and
the element has been flagged as <a href="#parser-inserted">"parser-inserted"</a>,
- and the <code><a href="dom.html#document">Document</a></code> of the <a href="parsing.html#html-parser">HTML parser</a> or
+ and either the parser that created the <code><a href="#the-script-element">script</a></code> is an
+ <a href="the-xhtml-syntax.html#xml-parser">XML parser</a> or it's an <a href="parsing.html#html-parser">HTML parser</a> whose
+ <a href="parsing.html#script-nesting-level">script nesting level</a> is zero, and the
+ <code><a href="dom.html#document">Document</a></code> of the <a href="parsing.html#html-parser">HTML parser</a> or
<a href="the-xhtml-syntax.html#xml-parser">XML parser</a> that created the <code><a href="#the-script-element">script</a></code>
element <a href="styling.html#has-a-style-sheet-that-is-blocking-scripts">has a style sheet that is blocking
scripts</a></dt>
Received on Friday, 21 September 2012 10:43:42 UTC