Make it possible to unset a url/input https://www.w3.org/Bugs/Public/…

…show_bug.cgi?id=27047
whatwg · Oct 16, 2014 · ac1df21 · ac1df21
1 parent 217cf06
commit ac1df21
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/url.html b/url.html
@@ -2116,19 +2116,27 @@ <h2 id="api"><span class="secno">7 </span>API</h2>
 <ol>
  <li><p>Set <a href="#concept-urlutils-url" title="concept-URLUtils-url">url</a> to null.
 
- <li><p>Set <a href="#concept-urlutils-input" title="concept-URLUtils-input">input</a> to the given value.
+ <li><p>If the given value is null, set <a href="#concept-urlutils-input" title="concept-URLUtils-input">input</a> to
+ the empty string.
 
- <li><p>Let <var title="">url</var> be the result of running the
- <a href="#concept-url-parser" title="concept-url-parser">URL parser</a> on
- <a href="#concept-urlutils-input" title="concept-URLUtils-input">input</a> with
- <a href="#concept-base-url" title="concept-base-url">base URL</a> being the result of running
- <a href="#concept-urlutils-get-the-base" title="concept-URLUtils-get-the-base">get the base</a> and
- <a href="#concept-urlutils-query-encoding" title="concept-URLUtils-query-encoding">query encoding</a> as
- <var>encoding override</var>.
- <!-- support blob URLs at this level -->
+ <li>
+  <p>Otherwise, run these substeps:
 
- <li><p>If <var title="">url</var> is not failure, set
- <a href="#concept-urlutils-url" title="concept-URLUtils-url">url</a> to <var title="">url</var>.
+  <ol>
+   <li><p>Set <a href="#concept-urlutils-input" title="concept-URLUtils-input">input</a> to the given value.
+
+   <li><p>Let <var title="">url</var> be the result of running the
+   <a href="#concept-url-parser" title="concept-url-parser">URL parser</a> on
+   <a href="#concept-urlutils-input" title="concept-URLUtils-input">input</a> with
+   <a href="#concept-base-url" title="concept-base-url">base URL</a> being the result of running
+   <a href="#concept-urlutils-get-the-base" title="concept-URLUtils-get-the-base">get the base</a> and
+   <a href="#concept-urlutils-query-encoding" title="concept-URLUtils-query-encoding">query encoding</a> as
+   <var>encoding override</var>.
+   <!-- support blob URLs at this level -->
+
+   <li><p>If <var title="">url</var> is not failure, set
+   <a href="#concept-urlutils-url" title="concept-URLUtils-url">url</a> to <var title="">url</var>.
+  </ol>
 
  <li><p>Let <var title="">query</var> be <a href="#concept-urlutils-url" title="concept-URLUtils-url">url</a>'s
  <a href="#concept-url-query" title="concept-URL-query">query</a> if <a href="#concept-urlutils-url" title="concept-URLUtils-url">url</a>

diff --git a/url.src.html b/url.src.html
@@ -2083,19 +2083,27 @@ <h2>API</h2>
 <ol>
  <li><p>Set <span title=concept-URLUtils-url>url</span> to null.
 
- <li><p>Set <span title=concept-URLUtils-input>input</span> to the given value.
+ <li><p>If the given value is null, set <span title=concept-URLUtils-input>input</span> to
+ the empty string.
 
- <li><p>Let <var title>url</var> be the result of running the
- <span title=concept-url-parser>URL parser</span> on
- <span title=concept-URLUtils-input>input</span> with
- <span title=concept-base-url>base URL</span> being the result of running
- <span title=concept-URLUtils-get-the-base>get the base</span> and
- <span title=concept-URLUtils-query-encoding>query encoding</span> as
- <var>encoding override</var>.
- <!-- support blob URLs at this level -->
+ <li>
+  <p>Otherwise, run these substeps:
 
- <li><p>If <var title>url</var> is not failure, set
- <span title=concept-URLUtils-url>url</span> to <var title>url</var>.
+  <ol>
+   <li><p>Set <span title=concept-URLUtils-input>input</span> to the given value.
+
+   <li><p>Let <var title>url</var> be the result of running the
+   <span title=concept-url-parser>URL parser</span> on
+   <span title=concept-URLUtils-input>input</span> with
+   <span title=concept-base-url>base URL</span> being the result of running
+   <span title=concept-URLUtils-get-the-base>get the base</span> and
+   <span title=concept-URLUtils-query-encoding>query encoding</span> as
+   <var>encoding override</var>.
+   <!-- support blob URLs at this level -->
+
+   <li><p>If <var title>url</var> is not failure, set
+   <span title=concept-URLUtils-url>url</span> to <var title>url</var>.
+  </ol>
 
  <li><p>Let <var title>query</var> be <span title=concept-URLUtils-url>url</span>'s
  <span title=concept-URL-query>query</span> if <span title=concept-URLUtils-url>url</span>