[html5] r5774 - [] (0) Provide a hook for the XHR spec. Fixing http://www.w3.org/Bugs/Public/sho [...]

whatwg at whatwg.org whatwg at whatwg.org
Tue Jan 11 12:56:51 PST 2011


Author: ianh
Date: 2011-01-11 12:56:50 -0800 (Tue, 11 Jan 2011)
New Revision: 5774

Modified:
   complete.html
   index
   source
Log:
[] (0) Provide a hook for the XHR spec.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11067

Modified: complete.html
===================================================================
--- complete.html	2011-01-11 20:40:02 UTC (rev 5773)
+++ complete.html	2011-01-11 20:56:50 UTC (rev 5774)
@@ -48849,6 +48849,8 @@
 
   <!-- http://hixie.ch/tests/adhoc/html/forms/submission/multipart_form-data/ -->
 
+  <!-- NOTE: This algorithm is also used by the XHR spec -->
+
   <p>The <dfn id=multipart/form-data-encoding-algorithm><code title="">multipart/form-data</code> encoding
   algorithm</dfn> is as follows:</p>
 
@@ -48856,7 +48858,13 @@
 
    <li>
 
-    <p>If the <code><a href=#the-form-element>form</a></code> element has an <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute,
+    <p>If the algorithm was invoked with an explicit character
+    encoding, let the selected character encoding be that encoding.
+    (This algorithm is used by other specifications, which provide an
+    explicit character encoding to avoid the dependency on the
+    <code><a href=#the-form-element>form</a></code> element described in the next paragraph.)</p>
+
+    <p>Otherwise, if the <code><a href=#the-form-element>form</a></code> element has an <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute,
     then, taking into account the characters found in the <var title="">form data set</var>'s names and values, and the character
     encodings supported by the user agent, select a character encoding
     from the list given in the <code><a href=#the-form-element>form</a></code>'s <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute
@@ -48880,9 +48888,8 @@
     <p>For each entry in the <var title="">form data set</var>,
     perform these substeps:</p>
 
-    <ol><li><p>If the entry's name is "<code title=attr-fe-name-charset><a href=#attr-fe-name-charset>_charset_</a></code>"
-     and its type is "<code title="">hidden</code>", replace its value
-     with <var title="">charset</var>.</li>
+    <ol><li><p>If the entry's name is "<code title=attr-fe-name-charset><a href=#attr-fe-name-charset>_charset_</a></code>" and its type is
+     "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
 
      <!-- the step that replaces a file with its name is missing in
      this version of the algorithm -->

Modified: index
===================================================================
--- index	2011-01-11 20:40:02 UTC (rev 5773)
+++ index	2011-01-11 20:56:50 UTC (rev 5774)
@@ -48831,6 +48831,8 @@
 
   <!-- http://hixie.ch/tests/adhoc/html/forms/submission/multipart_form-data/ -->
 
+  <!-- NOTE: This algorithm is also used by the XHR spec -->
+
   <p>The <dfn id=multipart/form-data-encoding-algorithm><code title="">multipart/form-data</code> encoding
   algorithm</dfn> is as follows:</p>
 
@@ -48838,7 +48840,13 @@
 
    <li>
 
-    <p>If the <code><a href=#the-form-element>form</a></code> element has an <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute,
+    <p>If the algorithm was invoked with an explicit character
+    encoding, let the selected character encoding be that encoding.
+    (This algorithm is used by other specifications, which provide an
+    explicit character encoding to avoid the dependency on the
+    <code><a href=#the-form-element>form</a></code> element described in the next paragraph.)</p>
+
+    <p>Otherwise, if the <code><a href=#the-form-element>form</a></code> element has an <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute,
     then, taking into account the characters found in the <var title="">form data set</var>'s names and values, and the character
     encodings supported by the user agent, select a character encoding
     from the list given in the <code><a href=#the-form-element>form</a></code>'s <code title=attr-form-accept-charset><a href=#attr-form-accept-charset>accept-charset</a></code> attribute
@@ -48862,9 +48870,8 @@
     <p>For each entry in the <var title="">form data set</var>,
     perform these substeps:</p>
 
-    <ol><li><p>If the entry's name is "<code title=attr-fe-name-charset><a href=#attr-fe-name-charset>_charset_</a></code>"
-     and its type is "<code title="">hidden</code>", replace its value
-     with <var title="">charset</var>.</li>
+    <ol><li><p>If the entry's name is "<code title=attr-fe-name-charset><a href=#attr-fe-name-charset>_charset_</a></code>" and its type is
+     "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
 
      <!-- the step that replaces a file with its name is missing in
      this version of the algorithm -->

Modified: source
===================================================================
--- source	2011-01-11 20:40:02 UTC (rev 5773)
+++ source	2011-01-11 20:56:50 UTC (rev 5774)
@@ -54957,6 +54957,8 @@
 
   <!-- http://hixie.ch/tests/adhoc/html/forms/submission/multipart_form-data/ -->
 
+  <!-- NOTE: This algorithm is also used by the XHR spec -->
+
   <p>The <dfn><code title="">multipart/form-data</code> encoding
   algorithm</dfn> is as follows:</p>
 
@@ -54968,7 +54970,13 @@
 
    <li>
 
-    <p>If the <code>form</code> element has an <code
+    <p>If the algorithm was invoked with an explicit character
+    encoding, let the selected character encoding be that encoding.
+    (This algorithm is used by other specifications, which provide an
+    explicit character encoding to avoid the dependency on the
+    <code>form</code> element described in the next paragraph.)</p>
+
+    <p>Otherwise, if the <code>form</code> element has an <code
     title="attr-form-accept-charset">accept-charset</code> attribute,
     then, taking into account the characters found in the <var
     title="">form data set</var>'s names and values, and the character
@@ -54997,9 +55005,10 @@
 
     <ol>
 
-     <li><p>If the entry's name is "<code title="attr-fe-name-charset">_charset_</code>"
-     and its type is "<code title="">hidden</code>", replace its value
-     with <var title="">charset</var>.</p></li>
+     <li><p>If the entry's name is "<code
+     title="attr-fe-name-charset">_charset_</code>" and its type is
+     "<code title="">hidden</code>", replace its value with <var
+     title="">charset</var>.</p></li>
 
      <!-- the step that replaces a file with its name is missing in
      this version of the algorithm -->




More information about the Commit-Watchers mailing list